diff --git a/modules/core/src/com/haulmont/cuba/core/sys/config/EntityFactory.java b/modules/core/src/com/haulmont/cuba/core/sys/config/EntityFactory.java
index 598f7d53b8..4a445f7716 100644
--- a/modules/core/src/com/haulmont/cuba/core/sys/config/EntityFactory.java
+++ b/modules/core/src/com/haulmont/cuba/core/sys/config/EntityFactory.java
@@ -36,6 +36,8 @@ public class EntityFactory extends TypeFactory {
         if (StringUtils.isBlank(string))
             return null;
         EntityLoadInfo info = EntityLoadInfo.parse(string);
+        if (info == null)
+            throw new IllegalArgumentException("Invalid entity info: " + string);
 
         Entity entity;
         Transaction tx = persistence.createTransaction();