diff --git a/detector/msf.go b/detector/msf.go
index 90cce6ca..76ce6e1f 100644
--- a/detector/msf.go
+++ b/detector/msf.go
@@ -22,7 +22,7 @@ func FillWithMetasploit(r *models.ScanResult, cnf config.MetasploitConf) (nMetas
 	}
 	defer func() {
 		if err := driver.CloseDB(); err != nil {
-			logging.Log.Errorf("Failed to close DB. err: %+v")
+			logging.Log.Errorf("Failed to close DB. err: %+v", err)
 		}
 	}()
 
diff --git a/oval/redhat.go b/oval/redhat.go
index effcbc72..9cc6019d 100644
--- a/oval/redhat.go
+++ b/oval/redhat.go
@@ -33,7 +33,7 @@ func (o RedHatBase) FillWithOval(r *models.ScanResult) (nCVEs int, err error) {
 		}
 		defer func() {
 			if err := driver.CloseDB(); err != nil {
-				logging.Log.Errorf("Failed to close DB. err: %+v")
+				logging.Log.Errorf("Failed to close DB. err: %+v", err)
 			}
 		}()
 
diff --git a/oval/suse.go b/oval/suse.go
index d1e6b956..bf598061 100644
--- a/oval/suse.go
+++ b/oval/suse.go
@@ -40,7 +40,7 @@ func (o SUSE) FillWithOval(r *models.ScanResult) (nCVEs int, err error) {
 		}
 		defer func() {
 			if err := driver.CloseDB(); err != nil {
-				logging.Log.Errorf("Failed to close DB. err: %+v")
+				logging.Log.Errorf("Failed to close DB. err: %+v", err)
 			}
 		}()
 
diff --git a/subcmds/saas.go b/subcmds/saas.go
index fd53ab61..927013df 100644
--- a/subcmds/saas.go
+++ b/subcmds/saas.go
@@ -125,5 +125,16 @@ func (p *SaaSCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{})
 		return subcommands.ExitFailure
 	}
 
+	if !config.Conf.Debug {
+		if err := os.RemoveAll(dir); err != nil {
+			logging.Log.Warnf("Failed to remove %s. err: %+v", dir, err)
+		}
+		symlink := filepath.Join(config.Conf.ResultsDir, "current")
+		err := os.Remove(symlink)
+		if err != nil {
+			logging.Log.Warnf("Failed to remove %s. err: %+v", dir, err)
+		}
+	}
+
 	return subcommands.ExitSuccess
 }