Merge PR #2832 by @flo - null hardening.

MovingBlocks · Mar 20, 2017 · be82821 · be82821
2 parents 7e3ba2c + e1f19d4
commit be82821
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/...c/main/java/org/terasology/persistence/typeHandling/extensionTypes/PrefabTypeHandler.java b/...c/main/java/org/terasology/persistence/typeHandling/extensionTypes/PrefabTypeHandler.java
@@ -37,6 +37,9 @@ public String getAsString(Prefab item) {
 
     @Override
     public Prefab getFromString(String representation) {
+        if (representation == null) {
+            return null;
+        }
         return Assets.getPrefab(representation).orElse(null);
     }
 }