gistfile1.txt

diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
index bc439e6..a95498a 100755
--- a/bitbake/bin/toaster
+++ b/bitbake/bin/toaster
@@ -173,12 +173,11 @@ fi
 # in the local layers that currently prevent using an arbitrary
 # toasterconf.json
 if [ "$TOASTER_CONF" = "" ]; then
-    BIN_DIR=$(dirname -- "$0")
-    export TOASTER_CONF="$BIN_DIR/../../meta-yocto/conf/toasterconf.json"
+    export TOASTER_CONF="$BUILDDIR/../meta/conf/toasterconf.json"
 fi
 if [ ! -f $TOASTER_CONF ]; then
     echo "$TOASTER_CONF configuration file not found, exiting..."
-    exit 1;
+    return 1
 fi
 # this defines the dir toaster will use for
 # 1) clones of layers (in _toaster_clones )