diff --git a/lib/core/option.py b/lib/core/option.py
index b51622641..03c5b5300 100644
--- a/lib/core/option.py
+++ b/lib/core/option.py
@@ -1445,7 +1445,7 @@ def _createTemporaryDirectory():
 
     if not os.path.isdir(tempfile.gettempdir()):
         os.makedirs(tempfile.gettempdir())
-    tempfile.tempdir = tempfile.mkdtemp(prefix="sqlmap", suffix=str(os.getpid()))
+    kb.tempDir = tempfile.tempdir = tempfile.mkdtemp(prefix="sqlmap", suffix=str(os.getpid()))
     if not os.path.isdir(tempfile.tempdir):
         os.makedirs(tempfile.tempdir)
 
@@ -1772,6 +1772,7 @@ def _setKnowledgeBaseAttributes(flushAll=True):
     kb.storeHashesChoice = None
     kb.suppressResumeInfo = False
     kb.technique = None
+    kb.tempDir = None
     kb.testMode = False
     kb.testQueryCount = 0
     kb.testType = None
diff --git a/sqlmap.py b/sqlmap.py
index 0c20bb1eb..c01bab3ad 100755
--- a/sqlmap.py
+++ b/sqlmap.py
@@ -153,7 +153,8 @@ def main():
         if conf.get("showTime"):
             dataToStdout("\n[*] shutting down at %s\n\n" % time.strftime("%X"), forceOutput=True)
 
-        shutil.rmtree(tempfile.tempdir, ignore_errors=True)
+        if kb.get("tempDir"):
+            shutil.rmtree(kb.tempDir, ignore_errors=True)
 
         kb.threadContinue = False
         kb.threadException = True