diff --git a/src/main/java/com/boydti/fawe/object/HistoryExtent.java b/src/main/java/com/boydti/fawe/object/HistoryExtent.java
index 7f4eca3f..c022f946 100644
--- a/src/main/java/com/boydti/fawe/object/HistoryExtent.java
+++ b/src/main/java/com/boydti/fawe/object/HistoryExtent.java
@@ -152,7 +152,7 @@ public class HistoryExtent extends AbstractDelegateExtent {
     @Override
     public Entity createEntity(final Location location, final BaseEntity state) {
         final Entity entity = super.createEntity(location, state);
-        if (state != null) {
+        if (state != null && entity != null) {
             changeSet.add(new EntityCreate(location, state, entity));
         }
         return entity;