diff --git a/tokenize.cpp b/tokenize.cpp
index 49e93fc16..8dec11cac 100644
--- a/tokenize.cpp
+++ b/tokenize.cpp
@@ -1220,7 +1220,7 @@ bool Tokenizer::simplifyIfAddBraces()
 {
     bool ret = false;
 
-    for ( TOKEN *tok = _tokens; tok; tok = tok->next() )
+    for ( TOKEN *tok = _tokens; tok; tok = tok ? tok->next() : NULL )
     {
         if ( ! TOKEN::Match(tok, "if|for|while (") )
             continue;