diff --git a/generator/proto/_utils.py b/generator/proto/_utils.py
index 8ca51f3..7076e9d 100644
--- a/generator/proto/_utils.py
+++ b/generator/proto/_utils.py
@@ -40,4 +40,4 @@
 
         return protoc.main(argv)
     else:
-        return subprocess.check_call(argv)
+        return subprocess.call(argv)
diff --git a/generator/protoc b/generator/protoc
index 4c4053b..4b1512d 100755
--- a/generator/protoc
+++ b/generator/protoc
@@ -24,6 +24,5 @@
     if os.path.isfile(protoc_gen_nanopb):
          args = ['--plugin=protoc-gen-nanopb=%s' % protoc_gen_nanopb] + args
 
-    print(args)
     status = invoke_protoc(['protoc'] + args)
     sys.exit(status)
diff --git a/tests/site_scons/site_tools/nanopb.py b/tests/site_scons/site_tools/nanopb.py
index 1014827..ffad59d 100644
--- a/tests/site_scons/site_tools/nanopb.py
+++ b/tests/site_scons/site_tools/nanopb.py
@@ -88,8 +88,9 @@
 
     p = _detect_protoc(env)
     n = _detect_nanopb(env)
-    p1 = os.path.join(n, 'generator-bin', 'protoc' + env['PROGSUFFIX'])
-    if p == env['ESCAPE'](p1):
+    p1 = os.path.join(n, 'generator', 'protoc' + env['PROGSUFFIX'])
+    p2 = os.path.join(n, 'generator-bin', 'protoc' + env['PROGSUFFIX'])
+    if p in [env['ESCAPE'](p1), env['ESCAPE'](p2)]:
         # Using the bundled protoc, no options needed
         return ''