diff --git a/lib/Interpreter/ASTNodeEraser.cpp b/lib/Interpreter/ASTNodeEraser.cpp
index 574c5f56..c9b9e503 100644
--- a/lib/Interpreter/ASTNodeEraser.cpp
+++ b/lib/Interpreter/ASTNodeEraser.cpp
@@ -303,7 +303,9 @@ namespace cling {
     if (!Map)
       return false;
     StoredDeclsMap::iterator Pos = Map->find(VD->getDeclName());
-    assert(Pos != Map->end() && "no lookup entry for decl");
+    // FIXME: All of that should be moved in VisitNamedDecl
+    assert((VD->isHidden() || Pos != Map->end())
+           && "no lookup entry for decl");
 
     if (Pos->second.isNull())
       // We need to rewire the list of the redeclarations in order to exclude