diff --git a/build/build-marvin.xml b/build/build-marvin.xml
index daa77b91301..6daac03f2ce 100644
--- a/build/build-marvin.xml
+++ b/build/build-marvin.xml
@@ -40,7 +40,7 @@
 
     <target name="build-marvin" depends="build-apidocs" description="generates the cloudstackAPIs for marvin">
         <echo message="Generating Marvin API Classes"/>
-        <exec dir="${marvin.src.dir}" executable="python">
+        <exec dir="${marvin.src.dir}" executable="python" failonerror="true">
             <arg value="codegenerator.py" />
             <arg value="-s" />
             <arg value="${dist.dir}/commands.xml" />
@@ -50,7 +50,7 @@
 
     <target name="package-marvin" depends="build-marvin" description="create a distributable tarball of Marvin">
         <echo message="Packaging Marvin"/>
-        <exec dir="${marvin.dir}" executable="python">
+        <exec dir="${marvin.dir}" executable="python" failonerror="true">
             <arg value="setup.py" />
             <arg value="sdist" />
         </exec>
diff --git a/tools/marvin/setup.py b/tools/marvin/setup.py
index c0e4af42d4c..96981ee217a 100644
--- a/tools/marvin/setup.py
+++ b/tools/marvin/setup.py
@@ -18,10 +18,11 @@
 
 from distutils.core import setup
 from sys import version
+import sys
 
 if version < "2.7":
     print "Marvin needs at least python 2.7, found : \n%s"%version
-    raise
+    sys.exit(1)
 
 setup(name="Marvin",
       version="0.1.0",