diff --git a/setup/installer/__init__.py b/setup/installer/__init__.py
index eeb2099f3c..95178ebe4e 100644
--- a/setup/installer/__init__.py
+++ b/setup/installer/__init__.py
@@ -152,7 +152,7 @@ class VMInstaller(Command):
         p2.wait()
         rc = p.wait()
         if rc != 0:
-            raise SystemExit(rc)
+            raise SystemExit('VM builder failed with error code: %s' % rc)
         self.download_installer()
 
     def installer(self):
@@ -184,8 +184,7 @@ class VMInstaller(Command):
         subprocess.check_call(['scp',
             self.VM_NAME+':build/calibre/'+installer, 'dist'])
         if not os.path.exists(installer):
-            self.warn('Failed to download installer: '+installer)
-            raise SystemExit(1)
+            raise SystemExit('Failed to download installer: '+installer)
 
     def clean(self):
         installer = self.installer()