diff --git a/lib/core/settings.py b/lib/core/settings.py
index 62352e48a..5737e0e34 100644
--- a/lib/core/settings.py
+++ b/lib/core/settings.py
@@ -19,7 +19,7 @@ from lib.core.enums import OS
 from thirdparty import six
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.10.11.49"
+VERSION = "1.10.11.50"
 TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
 TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
 VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)
diff --git a/sqlmap.py b/sqlmap.py
index feacbc82c..98446f6dc 100755
--- a/sqlmap.py
+++ b/sqlmap.py
@@ -648,6 +648,9 @@ def main():
                 except OSError:
                     pass
 
+        # Note: --time-limit must not interrupt the final cleanup (e.g. session flush or HAR file writing)
+        conf.timeLimit = None
+
         if conf.get("hashDB"):
             conf.hashDB.flush()
             conf.hashDB.close()         # NOTE: because of PyPy