diff --git a/build/build-develop-addons-sdk-advanced.py b/build/build-develop-addons-sdk-advanced.py
index 188d3d1656..c6e9569b75 100644
--- a/build/build-develop-addons-sdk-advanced.py
+++ b/build/build-develop-addons-sdk-advanced.py
@@ -11,12 +11,13 @@ try:
     base.cmd_in_dir('.', "grunt", ["--level=ADVANCED", "--addon=sdkjs-forms", "--addon=sdkjs-ooxml"])
     base.cmd_in_dir('.', "grunt", ["develop", "--compiled", "--addon=sdkjs-forms", "--addon=sdkjs-ooxml"])
 
-    raw_input("Press Enter to continue...")
-
+    input("Press Enter to continue...")
+    exit(0)
 except SystemExit:
-    raw_input("Ignoring SystemExit. Press Enter to continue...")
+    input("Ignoring SystemExit. Press Enter to continue...")
     exit(0)
 except KeyboardInterrupt:
     pass
 except:
-    raw_input("Unexpected error. " + traceback.format_exc() + "Press Enter to continue...")
+    input("Unexpected error. " + traceback.format_exc() + "Press Enter to continue...")
+    exit(0)
diff --git a/build/build-develop-addons-sdk-whitespace.py b/build/build-develop-addons-sdk-whitespace.py
index c01b98ee8b..b47e31dc7d 100644
--- a/build/build-develop-addons-sdk-whitespace.py
+++ b/build/build-develop-addons-sdk-whitespace.py
@@ -11,12 +11,13 @@ try:
     base.cmd_in_dir('.', "grunt", ["--level=WHITESPACE_ONLY", "--addon=sdkjs-forms", "--addon=sdkjs-ooxml"])
     base.cmd_in_dir('.', "grunt", ["develop", "--compiled", "--addon=sdkjs-forms", "--addon=sdkjs-ooxml"])
 
-    raw_input("Press Enter to continue...")
-
+    input("Press Enter to continue...")
+    exit(0)
 except SystemExit:
-    raw_input("Ignoring SystemExit. Press Enter to continue...")
+    input("Ignoring SystemExit. Press Enter to continue...")
     exit(0)
 except KeyboardInterrupt:
     pass
 except:
-    raw_input("Unexpected error. " + traceback.format_exc() + "Press Enter to continue...")
+    input("Unexpected error. " + traceback.format_exc() + "Press Enter to continue...")
+    exit(0)
diff --git a/build/build-develop-addons.py b/build/build-develop-addons.py
index 4d0c675aa2..d029eb7402 100644
--- a/build/build-develop-addons.py
+++ b/build/build-develop-addons.py
@@ -11,12 +11,13 @@ try:
     base.cmd_in_dir('.', "grunt", ["--level=WHITESPACE_ONLY", "--addon=sdkjs-forms", "--addon=sdkjs-ooxml"])
     base.cmd_in_dir('.', "grunt", ["develop", "--addon=sdkjs-forms", "--addon=sdkjs-ooxml"])
 
-    raw_input("Press Enter to continue...")
-
+    input("Press Enter to continue...")
+    exit(0)
 except SystemExit:
-    raw_input("Ignoring SystemExit. Press Enter to continue...")
+    input("Ignoring SystemExit. Press Enter to continue...")
     exit(0)
 except KeyboardInterrupt:
     pass
 except:
-    raw_input("Unexpected error. " + traceback.format_exc() + "Press Enter to continue...")
+    input("Unexpected error. " + traceback.format_exc() + "Press Enter to continue...")
+    exit(0)