diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
index 15aba10f31d4..c34965c0e292 100644
--- a/lib/cppcheck.cpp
+++ b/lib/cppcheck.cpp
@@ -1100,7 +1100,8 @@ void CppCheck::checkNormalTokens(const Tokenizer &tokenizer)
     if (mSettings.useSingleJob() || !mSettings.buildDir.empty()) {
         // Analyse the tokens..
 
-        if (CTU::FileInfo * const fi1 = CTU::getFileInfo(tokenizer)) {
+        {
+            CTU::FileInfo * const fi1 = CTU::getFileInfo(tokenizer);
             if (!mSettings.buildDir.empty())
                 mAnalyzerInformation.setFileInfo("ctu", fi1->toString());
             if (mSettings.useSingleJob())
diff --git a/lib/templatesimplifier.cpp b/lib/templatesimplifier.cpp
index c2067c94a73d..4f76648ae928 100644
--- a/lib/templatesimplifier.cpp
+++ b/lib/templatesimplifier.cpp
@@ -1346,7 +1346,7 @@ void TemplateSimplifier::simplifyTemplateAliases()
                     const Token * const fromStart = args[argnr].first;
                     const Token * const fromEnd   = args[argnr].second->previous();
                     Token *temp = TokenList::copyTokens(tok1, fromStart, fromEnd, true);
-                    const bool tempOK(temp && temp != tok1->next());
+                    const bool tempOK(temp != tok1->next());
                     tok1->deleteThis();
                     if (tempOK)
                         tok1 = temp; // skip over inserted parameters
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index 32529c6a7bda..bd35968ffe91 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -2151,9 +2151,6 @@ void Tokenizer::simplifyTypedefCpp()
 
                         tok2 = TokenList::copyTokens(tok2, argStart, argEnd);
                         if (inTemplate) {
-                            if (!tok2)
-                                syntaxError(nullptr);
-
                             tok2 = tok2->next();
                         }