diff --git a/lib/executionpath.cpp b/lib/executionpath.cpp
index c42b4f72d..c6ce2f9f6 100644
--- a/lib/executionpath.cpp
+++ b/lib/executionpath.cpp
@@ -450,7 +450,7 @@ void ExecutionPath::checkScope(const Token *tok, std::list<ExecutionPath *> &che
         }
 
 
-        {
+        if (tok) {
             tok = check->parse(*tok, checks);
             if (checks.empty())
                 return;
diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
index 41b791ed6..6907d9b25 100644
--- a/lib/valueflow.cpp
+++ b/lib/valueflow.cpp
@@ -655,7 +655,7 @@ static void removeValues(std::list<ValueFlow::Value> &values, const std::list<Va
         if (found)
             values.erase(it++);
         else
-            it++;
+            ++it;
     }
 }