diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
index b0190765a..9d4fd7d23 100644
--- a/cli/cmdlineparser.cpp
+++ b/cli/cmdlineparser.cpp
@@ -945,7 +945,7 @@ void CmdLineParser::PrintHelp()
               "                                 64 bit Windows\n"
               "                          * native\n"
               "                                 Unspecified platform. Type sizes of host system\n"
-              "                                 is assumed, but no further assumptions.\n"
+              "                                 are assumed, but no further assumptions.\n"
               "    -q, --quiet          Only print error messages.\n"
               "    -rp, --relative-paths\n"
               "    -rp=<paths>, --relative-paths=<paths>\n"
diff --git a/lib/checkcondition.cpp b/lib/checkcondition.cpp
index 6deddea9e..e8c68706c 100644
--- a/lib/checkcondition.cpp
+++ b/lib/checkcondition.cpp
@@ -322,13 +322,13 @@ void CheckCondition::multiCondition()
     const SymbolDatabase* const symbolDatabase = _tokenizer->getSymbolDatabase();
 
     for (std::list<Scope>::const_iterator i = symbolDatabase->scopeList.begin(); i != symbolDatabase->scopeList.end(); ++i) {
-        if (i->type != Scope::eIf || !Token::simpleMatch(i->classDef, "if ("))
+        if (i->type != Scope::eIf)
             continue;
 
         const Token * const cond1 = i->classDef->next()->astOperand2();
 
         const Token * tok2 = i->classDef->next();
-        while (tok2) {
+        for (;;) {
             tok2 = tok2->link();
             if (!Token::simpleMatch(tok2, ") {"))
                 break;
diff --git a/test/testsymboldatabase.cpp b/test/testsymboldatabase.cpp
index fb6766009..8286465ff 100644
--- a/test/testsymboldatabase.cpp
+++ b/test/testsymboldatabase.cpp
@@ -2237,7 +2237,8 @@ private:
                           "   }\n"
                           "};");
             ASSERT(db && db->findScopeByName("Bar") && !db->findScopeByName("Bar")->functionList.front().isImplicitlyVirtual(false));
-            ASSERT_EQUALS(1, db->findScopeByName("Bar")->functionList.size());
+            if (db)
+                ASSERT_EQUALS(1, db->findScopeByName("Bar")->functionList.size());
         }
 
         // #5590