diff --git a/scripts/poky-env-internal b/scripts/poky-env-internal
index ccbd2088ae..78a7d45ad0 100755
--- a/scripts/poky-env-internal
+++ b/scripts/poky-env-internal
@@ -26,6 +26,8 @@ OEROOT=`pwd`
 
 if [ "x$1" = "x" ]; then
 	BDIR="build"
+else
+	BDIR="$1"
 fi
 
 BBDIR="$OEROOT/bitbake/"
@@ -48,7 +50,6 @@ BUILDDIR=`readlink -f "$BUILDDIR"`
 
 if ! (test -d "$BBDIR" && test -d "$PKGDIR" && test -d "$BUILDDIR"); then
     echo >&2 "Error: Not all directories exist! Did you run this script in poky directory?"
-    exit 1
 fi
 
 if ! (test -r "$BUILDDIR/conf/local.conf"); then