diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index ebded488c..74084374a 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -3842,7 +3842,7 @@ void Tokenizer::printDebugOutput() const
                 reportError(tok,
                             Severity::debug,
                             "debug",
-                            "Variable::typeStartToken() is not located before Variable::typeEndToken(). The location of the typeStartToken() is '" + var->typeStartToken()->str() + "' at line " + MathLib::toString(var->typeStartToken()->linenr()));
+                            "Variable::typeStartToken() of variable '" + var->name() + "' is not located before Variable::typeEndToken(). The location of the typeStartToken() is '" + var->typeStartToken()->str() + "' at line " + MathLib::toString(var->typeStartToken()->linenr()));
             }
         }
     }
diff --git a/test/testsymboldatabase.cpp b/test/testsymboldatabase.cpp
index 5a88c4dc7..822b305cb 100644
--- a/test/testsymboldatabase.cpp
+++ b/test/testsymboldatabase.cpp
@@ -1062,7 +1062,7 @@ private:
         // 1 scope: Global
         ASSERT(db && db->scopeList.size() == 1);
 
-        if (db && db->scopeList.size() >= 1) {
+        if (db && !db->scopeList.empty()) {
             // No functions
             ASSERT(db->scopeList.front().functionList.empty());
         }