diff --git a/src/main/java/net/minecraft/world/chunk/Chunk.java b/src/main/java/net/minecraft/world/chunk/Chunk.java
index 23d0e08..7fcf5ab 100644
--- a/src/main/java/net/minecraft/world/chunk/Chunk.java
+++ b/src/main/java/net/minecraft/world/chunk/Chunk.java
@@ -929,7 +929,7 @@
 		MinecraftForge.EVENT_BUS.post(new ChunkEvent.Load(this));
 
 		loadTime = unbindTime = ((WorldServer)worldObj).func_73046_m().getTickCounter();
-		lastsavePendingCount = pendingUpdatesSet.size();
+		lastsavePendingCount = pendingUpdatesSet == null ? 0 : pendingUpdatesSet.size();
 	}
 
 	public void onChunkUnload()
@@ -1627,11 +1627,11 @@
 	public void postSave()
 	{
 		wasActive = false;
-		lastsavePendingCount = pendingUpdatesSet.size();
+		lastsavePendingCount = pendingUpdatesSet == null ? 0 : pendingUpdatesSet.size();
 	}
 	
 	public boolean shouldSaveOnUnload()
 	{
-		return isModified || lastsavePendingCount != pendingUpdatesSet.size() || wasActive && hasEntities;
+		return isModified || pendingUpdatesSet != null && lastsavePendingCount != pendingUpdatesSet.size() || wasActive && hasEntities;
 	}
 }