diff --git a/utils/scan-build b/utils/scan-build
index 540a60b..908795e 100755
--- a/utils/scan-build
+++ b/utils/scan-build
@@ -196,14 +196,15 @@
   die "RunNumber must be defined!" if (!defined $RunNumber);
   
   # Append the run number.
+  my $NewDir;
   if ($TmpMode) {
-    my $NewDir = "$Dir/$Prog-$DateString-$RunNumber";
-    mkdir $NewDir;
-    return $NewDir;
+    $NewDir = "$Dir/$Prog-$DateString-$RunNumber";
   }
   else {
-    return "$Dir/$DateString-$RunNumber";
+    $NewDir = "$Dir/$DateString-$RunNumber";
   }
+  system 'mkdir','-p',$NewDir;
+  return $NewDir;
 }
 
 sub SetHtmlEnv {
@@ -401,8 +402,6 @@
   if (scalar(@files) == 0 and $Crashes == 0) {
     Diag("Removing directory '$Dir' because it contains no reports.\n");
     system ("rm", "-fR", $Dir);
-    # Remove the base directory if it contains no files (don't use '-R').
-    system ("rm", "-f", $BaseDir) if (defined $BaseDir);
     return 0;
   }