diff --git a/common/buildcraft/core/utils/WorldProperty.java b/common/buildcraft/core/utils/WorldProperty.java
index 34523b33..ee309aa7 100755
--- a/common/buildcraft/core/utils/WorldProperty.java
+++ b/common/buildcraft/core/utils/WorldProperty.java
@@ -49,7 +49,9 @@ public abstract class WorldProperty implements IWorldProperty {
 	@Override
 	public void clear() {
 		for (DimensionProperty p : properties) {
-			p.clear();
+			if (p != null) {
+				p.clear();
+			}
 		}
 
 		properties.clear();