diff --git a/scripts/Build-Pkg b/scripts/Build-Pkg
index b903a93e2..87d0fbfae 100755
--- a/scripts/Build-Pkg
+++ b/scripts/Build-Pkg
@@ -398,6 +398,7 @@ if [ $this_is_the_2nd_run = 0 ] ; then
 		/usr/bin/time -o "$root/var/adm/cache/$xpkg.tm" \
 		              -f 'buildtime=$(qcalc %U + %S)' $0 $options
 		returncode=$?
+		[ ! -e "$root/var/adm/cache/$xpkg.tm" ] && exit $returncode
 
 		qcalc() { gawk "BEGIN { printf(\"%d\n\", ($*)*100); }"; }
 		eval "`grep -v '^Command ' < $root/var/adm/cache/$xpkg.tm`"
diff --git a/scripts/Build-Tools b/scripts/Build-Tools
index d15252dca..a14ec9078 100755
--- a/scripts/Build-Tools
+++ b/scripts/Build-Tools
@@ -263,8 +263,8 @@ EOT
 
 		echo_status  "Testing $toolsdir/lib/fl_wrapper.so."
 		if ! sh -c "LD_PRELOAD=\"\$LD_PRELOAD:build/\$ROCKCFG_ID/`
-			`$toolsdir/lib/fl_wrapper.so\" date ; `
-			`exit $?" >/dev/null 2>&1
+			`ROCK/$toolsdir/lib/fl_wrapper.so\" date ; `
+			`exit \$?" >/dev/null 2>&1
 		then
 			echo_error "Detected a problem with the flist" \
 			           "wrapper lib on your system."