diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 0925429..56bf40c 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -10,6 +10,7 @@
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/test-plugin" />
+            <option value="$PROJECT_DIR$/wrapper-entity" />
           </set>
         </option>
       </GradleProjectSettings>
diff --git a/src/main/java/me/tofaa/entitylib/EntityLib.java b/src/main/java/me/tofaa/entitylib/EntityLib.java
index 4e7dc34..2e3b52a 100644
--- a/src/main/java/me/tofaa/entitylib/EntityLib.java
+++ b/src/main/java/me/tofaa/entitylib/EntityLib.java
@@ -104,9 +104,6 @@ public final class EntityLib {
         checkInit();
         Metadata m = new Metadata(entityId);
         BiFunction<Integer, Metadata, EntityMeta> function = metaRegistry.get(entityType);
-        if (function == null) {
-            throw new IllegalArgumentException("No meta converter for entity type " + entityType);
-        }
         EntityMeta meta =  function.apply(entityId, m);
         metadata.put(entityId, meta);
         return meta;
diff --git a/src/main/java/me/tofaa/entitylib/MetaConverterRegistry.java b/src/main/java/me/tofaa/entitylib/MetaConverterRegistry.java
index 3577d45..782f8e6 100644
--- a/src/main/java/me/tofaa/entitylib/MetaConverterRegistry.java
+++ b/src/main/java/me/tofaa/entitylib/MetaConverterRegistry.java
@@ -30,6 +30,7 @@ import me.tofaa.entitylib.meta.mobs.villager.VillagerMeta;
 import me.tofaa.entitylib.meta.mobs.villager.WanderingTraderMeta;
 import me.tofaa.entitylib.meta.projectile.*;
 import me.tofaa.entitylib.meta.types.PlayerMeta;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.HashMap;
@@ -159,8 +160,8 @@ final class MetaConverterRegistry {
         return (Class<T>) metaClasses.get(entityType);
     }
 
-    public @Nullable BiFunction<Integer, Metadata, EntityMeta> get(EntityType entityType) {
-        return converters.get(entityType);
+    public @NotNull BiFunction<Integer, Metadata, EntityMeta> get(EntityType entityType) {
+        return converters.getOrDefault(entityType, EntityMeta::new);
     }
 
 }