diff --git a/lib/core/common.py b/lib/core/common.py
index 335a5c9e1..384e5e50f 100644
--- a/lib/core/common.py
+++ b/lib/core/common.py
@@ -130,7 +130,7 @@ def formatDBMSfp(versions=None):
     @rtype: C{str}
     """
 
-    if not versions:
+    if not versions or versions == [None]:
         versions = kb.dbmsVersion
 
     if isinstance(versions, str):
diff --git a/plugins/dbms/mysql.py b/plugins/dbms/mysql.py
index 762e6f615..16ab89776 100644
--- a/plugins/dbms/mysql.py
+++ b/plugins/dbms/mysql.py
@@ -218,7 +218,7 @@ class MySQLMap(Fingerprint, Enumeration, Filesystem, Miscellaneous, Takeover):
             value += "\n%scomment injection fingerprint: %s" % (blank, comVer)
 
         if kb.bannerFp:
-            banVer = kb.bannerFp["dbmsVersion"]
+            banVer = kb.bannerFp["dbmsVersion"] if 'dbmsVersion' in kb.bannerFp else None
 
             if re.search("-log$", kb.data.banner):
                 banVer += ", logging enabled"