--- a/sbsv2/raptor/python/raptor.py	Fri Jan 29 09:52:16 2010 +0000
+++ b/sbsv2/raptor/python/raptor.py	Fri Feb 05 20:24:19 2010 +0000
@@ -631,7 +631,7 @@
 		return True
 
 	def SetMakeEngine(self, makeEngine):
-		self.makeEngine = makeEngine
+		self.makeEngineName = makeEngine
 		return True
 
 	def AddMakeOption(self, makeOption):
@@ -1276,15 +1276,17 @@
 			if self.toolcheck != 'off':
 				self.CheckConfigs(buildUnitsToBuild)
 			else:
-				self.Info(" Not Checking Tool Versions")
+				self.Info("Not Checking Tool Versions")
 
 			self.AssertBuildOK()
 
 			# Setup a make engine.
 			if not self.maker:
-				self.maker = raptor_make.MakeEngine(self)
-				if self.maker == None:
-					self.Error("No make engine present")
+				try:
+					self.maker = raptor_make.MakeEngine(self, self.makeEngineName)
+				except raptor_make.BadMakeEngineException,e:
+					self.Error("Unable to use make engine: %s " % str(e))
+					
 
 			self.AssertBuildOK()