diff -r cc47e11ccec1 -r 3d57cabf9cf2 configs/common/Benchmarks.py
--- a/configs/common/Benchmarks.py	Tue Jun 05 14:20:13 2012 -0400
+++ b/configs/common/Benchmarks.py	Wed Jun 06 17:11:02 2012 -0500
@@ -58,9 +58,9 @@
         elif buildEnv['TARGET_ISA'] == 'arm':
             return env.get('LINUX_IMAGE', disk('linux-arm-ael.img'))
         else:
-            print "Don't know what default disk image to use for ISA %s" % \
+            print "Don't know what default disk image to use for %s ISA" % \
                 buildEnv['TARGET_ISA']
-            sys.exit(1)
+            exit(1)
 
 # Benchmarks are defined as a key in a dict which is a list of SysConfigs
 # The first defined machine is the test system, the others are driving systems
diff -r cc47e11ccec1 -r 3d57cabf9cf2 configs/example/fs.py
--- a/configs/example/fs.py	Tue Jun 05 14:20:13 2012 -0400
+++ b/configs/example/fs.py	Wed Jun 06 17:11:02 2012 -0500
@@ -107,7 +107,7 @@
             bare_metal=options.bare_metal)
     Simulation.setWorkCountOptions(test_sys, options)
 else:
-    fatal("incapable of building non-alpha or non-sparc full system!")
+    fatal("Incapable of building %s full system!", buildEnv['TARGET_ISA'])
 
 if options.kernel is not None:
     test_sys.kernel = binary(options.kernel)