diff --git a/src/main/java/net/minecraftforge/client/model/SimpleModelState.java b/src/main/java/net/minecraftforge/client/model/SimpleModelState.java
index 2f52a660ea..9497605a59 100644
--- a/src/main/java/net/minecraftforge/client/model/SimpleModelState.java
+++ b/src/main/java/net/minecraftforge/client/model/SimpleModelState.java
@@ -28,7 +28,14 @@ public final class SimpleModelState implements IModelState
 
     public Optional<TRSRTransformation> apply(Optional<? extends IModelPart> part)
     {
-        if(!part.isPresent() || !map.containsKey(part.get())) return def;
+        if(!part.isPresent())
+        {
+            return def;
+        }
+        if(!map.containsKey(part.get()))
+        {
+            return Optional.absent();
+        }
         return Optional.fromNullable(map.get(part.get()));
     }
 }