diff --git a/makebuildserver.py b/makebuildserver.py
index 0c23c588..09ef8ef4 100755
--- a/makebuildserver.py
+++ b/makebuildserver.py
@@ -29,6 +29,7 @@ with open(os.path.join(serverdir, 'up.log'), 'w') as log:
     log.write('==stderr==\n' + err + '\n\n')
 if returncode != 0:
     print "Failed to configure server"
+    sys.exit(1)
 print "Stopping build server VM"
 vagrant(['halt'], serverdir)