diff --git a/nbuild b/nbuild
index 3683993..40a7f9a 100644
--- a/nbuild
+++ b/nbuild
@@ -17,6 +17,7 @@ use NBuild::Func;
 use File::Path qw(rmtree mkpath);
 use Sys::Hostname;
 use Log::Log4perl;
+use File::Path;
 
 =todo
 # some VMs do not allow to specify the init process...
@@ -107,6 +108,29 @@ EOT
 sub cleanup_and_exit {
     my ($var, $msg)=@_;
     $var=0 unless defined $var;
-    if(defined )    
+    if(defined $msg){
+        if($var!=0){
+            print STDERR $msg;
+        }
+        else{
+            say $msg;
+        }
+    }
+    rmtree $BUILD_DIST_TMP unless undef $BUILD_DIST_TMP;
+    if(undef $BUILD_OPTIONS_PARSED){
+        return;
+    }
+    rmtree $BUILD_ROOT . '/exit';
+    if(defined $RUN_SHELL_AFTER_FAIL && $BUILD_SUCCEEDED==0 && $var==1){
+        undef $BUILD_SUCCEEDED;
+
+    }
 }
 
+sub fail_exit {
+    cleanup_and_exit(1,'');
+}
+
+sub run_shell {
+
+}