diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetamodelImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetamodelImpl.java
index 43eaaaeb2f..cafaacd56f 100755
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetamodelImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetamodelImpl.java
@@ -77,6 +77,7 @@ public class MetamodelImpl implements MetamodelImplementor, Serializable {
 	// todo : Integrate EntityManagerLogger into CoreMessageLogger
 	private static final EntityManagerMessageLogger log = HEMLogging.messageLogger( MetamodelImpl.class );
 	private static final Object ENTITY_NAME_RESOLVER_MAP_VALUE = new Object();
+	private static final String INVALID_IMPORT = "";
 
 	private final SessionFactoryImplementor sessionFactory;
 
@@ -581,9 +582,13 @@ public class MetamodelImpl implements MetamodelImplementor, Serializable {
 				return className;
 			}
 			catch ( ClassLoadingException cnfe ) {
+				imports.put( className, INVALID_IMPORT );
 				return null;
 			}
 		}
+		else if ( result == INVALID_IMPORT ) {
+			return null;
+		}
 		else {
 			return result;
 		}