diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake
index 36322d2a0e..6ae5bfaf89 100755
--- a/bitbake/bin/bitbake
+++ b/bitbake/bin/bitbake
@@ -337,7 +337,7 @@ class BBCooker:
             bb.msg.fatal(bb.msg.domain.Parsing, "Sorry, shell not available (%s)" % details )
         else:
             bb.data.update_data( self.configuration.data )
-            bb.data.expandKeys(localdata)
+            bb.data.expandKeys( self.configuration.data )
             shell.start( self )
             sys.exit( 0 )
 
diff --git a/bitbake/lib/bb/shell.py b/bitbake/lib/bb/shell.py
index 711cd4335f..cb8e97b715 100644
--- a/bitbake/lib/bb/shell.py
+++ b/bitbake/lib/bb/shell.py
@@ -181,7 +181,7 @@ class BitBakeShellCommands:
 
         except runqueue.TaskFailure, fnids:
             for fnid in fnids:
-                print "ERROR: '%s' failed" % td.fn_index[fnid])
+                print "ERROR: '%s' failed" % td.fn_index[fnid]
             global last_exception
             last_exception = runqueue.TaskFailure