diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index 5a10743a9..1fad8352a 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -606,7 +606,8 @@ bool Tokenizer::duplicateTypedef(Token **tokPtr, const Token *name, const Token
 
                 end = end->next();
             }
-            end = end->next();
+            if (end)
+                end = end->next();
         }
         else if (end->str() == "(")
         {