diff --git a/doc/THANKS b/doc/THANKS
index 46f80033d..12d5e7907 100644
--- a/doc/THANKS
+++ b/doc/THANKS
@@ -313,6 +313,9 @@ Michael Majchrowicz <mmajchrowicz@gmail.com>
     for providing really appreciated feedback
     for suggesting a lot of ideas and features
 
+Ahmad Maulana <matdhule@gmail.com>
+    for contributing one tamper scripts, halfversionedmorekeywords.py
+
 Ferruh Mavituna <ferruh@mavituna.com>
     for sharing ideas on the implementation of a couple of features
 
@@ -323,12 +326,12 @@ David McNab <david@conscious.co.nz>
 Spencer J. McIntyre <smcintyre@securestate.com>
     for reporting a minor bug
 
-Ahmad Maulana <matdhule@gmail.com>
-    for contributing one tamper scripts, halfversionedmorekeywords.py
-
 Brad Merrell <bradmer12@gmail.com>
     for reporting a minor bug
 
+Michael Meyer <m.meyer2k@gmail.com>
+    for suggesting a minor feature
+
 Enrico Milanese <enricomilanese@gmail.com>
     for reporting a minor bug
     for sharing some ideas for the PHP backdoor
diff --git a/lib/core/common.py b/lib/core/common.py
index 938e8ee0c..944f88962 100644
--- a/lib/core/common.py
+++ b/lib/core/common.py
@@ -193,7 +193,7 @@ class Format:
 
         htmlParsed = ""
 
-        if len(kb.htmlFp) == 0:
+        if len(kb.htmlFp) == 0 or kb.heuristicTest is None:
             return None
         elif len(kb.htmlFp) == 1:
             htmlParsed = kb.htmlFp[0]
@@ -405,7 +405,7 @@ class Backend:
            fingerprint phase.
         """
 
-        return kb.htmlFp
+        return kb.htmlFp if kb.heuristicTest is not None else []
 
     @staticmethod
     def getIdentifiedDbms():