diff --git a/src/lib/eolian/eolian_database.c b/src/lib/eolian/eolian_database.c
index 1ef535d793..5ef7804702 100644
--- a/src/lib/eolian/eolian_database.c
+++ b/src/lib/eolian/eolian_database.c
@@ -1414,10 +1414,15 @@ EAPI Eina_Bool eolian_eo_file_parse(const char *filepath)
              filepath = eina_hash_find(_filenames, filename);
              if (!filepath)
                {
-                  ERR("Unable to find class %s", inherit_name);
+                  ERR("Unable to find a file for class %s", inherit_name);
                   return EINA_FALSE;
                }
              if (!eolian_eo_file_parse(filepath)) return EINA_FALSE;
+             if (!eolian_class_find_by_name(inherit_name))
+               {
+                  ERR("Unable to find class %s", inherit_name);
+                  return EINA_FALSE;
+               }
              free(filename);
           }
      }