diff --git a/lib/controller/checks.py b/lib/controller/checks.py
index c87d4f71c..d4d684070 100644
--- a/lib/controller/checks.py
+++ b/lib/controller/checks.py
@@ -398,7 +398,9 @@ def checkSqlInjection(place, parameter, value):
                             if not Backend.getIdentifiedDbms():
                                 warnMsg = "using unescaped version of the test "
                                 warnMsg += "because of zero knowledge of the "
-                                warnMsg += "back-end DBMS"
+                                warnMsg += "back-end DBMS. you can try to "
+                                warnMsg += "explicitly set it using the --dbms "
+                                warnMsg += "option"
                                 singleTimeWarnMessage(warnMsg)
 
                             # Test for UNION query SQL injection
diff --git a/lib/core/common.py b/lib/core/common.py
index 611ba46d2..3e948b23d 100644
--- a/lib/core/common.py
+++ b/lib/core/common.py
@@ -2649,6 +2649,7 @@ def expandMnemonics(mnemonics, parser, args):
                 pointer = pointer.next[char]
             else:
                 pointer = None
+                break
 
         if pointer in (None, head):
             errMsg = "mnemonic '%s' can't be resolved to any parameter name" % name
diff --git a/lib/core/defaults.py b/lib/core/defaults.py
index be3f73c88..85f838eed 100644
--- a/lib/core/defaults.py
+++ b/lib/core/defaults.py
@@ -25,4 +25,4 @@ _defaults =  {
                 "tech":         "BEUST"
             }
 
-defaults = advancedDict(_defaults)
\ No newline at end of file
+defaults = advancedDict(_defaults)
diff --git a/lib/core/testing.py b/lib/core/testing.py
index 46f995c82..066aa183e 100644
--- a/lib/core/testing.py
+++ b/lib/core/testing.py
@@ -37,11 +37,17 @@ def smokeTest():
     retVal = True
     count, length = 0, 0
 
-    for _, _, files in os.walk(paths.SQLMAP_ROOT_PATH):
+    for root, _, files in os.walk(paths.SQLMAP_ROOT_PATH):
+        if 'extra' in root:
+            continue
+
         for ifile in files:
             length += 1
 
     for root, _, files in os.walk(paths.SQLMAP_ROOT_PATH):
+        if 'extra' in root:
+            continue
+
         for ifile in files:
             if os.path.splitext(ifile)[1].lower() == '.py' and ifile != '__init__.py':
                 path = os.path.join(root, os.path.splitext(ifile)[0])