diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index 8b069f954..dfa75810b 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -7950,8 +7950,7 @@ void Tokenizer::simplifyStd()
 
 const Token *Tokenizer::getFunctionTokenByName(const char funcname[]) const
 {
-    if (_symbolDatabase == NULL)
-        getSymbolDatabase();
+    getSymbolDatabase();
 
     std::list<Scope *>::const_iterator i;
 
@@ -7971,7 +7970,7 @@ const Token *Tokenizer::getFunctionTokenByName(const char funcname[]) const
 
 void Tokenizer::fillFunctionList()
 {
-    _symbolDatabase = new SymbolDatabase(this, _settings, _errorLogger);
+    getSymbolDatabase();
 }
 
 //---------------------------------------------------------------------------