diff --git a/client/pyscripts/pm3_eml2mfd.py b/client/pyscripts/pm3_eml2mfd.py
index 90803cf5e..950ca5c86 100755
--- a/client/pyscripts/pm3_eml2mfd.py
+++ b/client/pyscripts/pm3_eml2mfd.py
@@ -23,4 +23,4 @@ def main(argv):
             file_out.write(data)
 
 if __name__ == '__main__':
-    main(sys.argv)
+    sys.exit(main(sys.argv))
diff --git a/client/pyscripts/pm3_mfd2eml.py b/client/pyscripts/pm3_mfd2eml.py
index ae7a79825..e5dbff5fe 100755
--- a/client/pyscripts/pm3_mfd2eml.py
+++ b/client/pyscripts/pm3_mfd2eml.py
@@ -25,4 +25,4 @@ def main(argv):
             file_out.write("\n")
 
 if __name__ == '__main__':
-    main(sys.argv)
+    sys.exit(main(sys.argv))
diff --git a/client/pyscripts/xorcheck.py b/client/pyscripts/xorcheck.py
index a10c3bba6..f57934e77 100755
--- a/client/pyscripts/xorcheck.py
+++ b/client/pyscripts/xorcheck.py
@@ -38,7 +38,7 @@ def main():
     Should produce the output:
 
     \tTarget (BA) requires final LRC XOR byte value: 5A\n""".format(sys.argv[0]))
-        return 0
+        return 1
 
     target= int(sys.argv[len(sys.argv) - 1],16)
 
@@ -48,4 +48,4 @@ def main():
     print('\nTarget (%02X) requires final LRC XOR byte value: %02X\n' % (target,lrc))
 
 if __name__ == "__main__":
-    main()
+    sys.exit(main())