X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.g3d%2Fsrc%2Forg%2Fsimantics%2Fg3d%2Fproperty%2FIntegerPropertyManipulator.java;h=045aa83072cdc6ed4bdb9879e5321fd8a143bafd;hb=faa2c9d309cd59039b49cb4a2f6b21b21546b951;hp=d0f5e1d6b4b4f645ad2295d740cfcf5cf267b48f;hpb=99366a416fcd1e18e0cf54c8efd255abfc8a01f4;p=simantics%2F3d.git

diff --git a/org.simantics.g3d/src/org/simantics/g3d/property/IntegerPropertyManipulator.java b/org.simantics.g3d/src/org/simantics/g3d/property/IntegerPropertyManipulator.java
index d0f5e1d6..045aa830 100644
--- a/org.simantics.g3d/src/org/simantics/g3d/property/IntegerPropertyManipulator.java
+++ b/org.simantics.g3d/src/org/simantics/g3d/property/IntegerPropertyManipulator.java
@@ -42,7 +42,9 @@ public class IntegerPropertyManipulator implements PropertyManipulator {
 		if (editMode)
 			return editValue;
 		try {
-			return provider.getValue(input).toString();
+			Object value = provider.getValue(input);
+			if (value == null) return null;
+			return value.toString();
 		} catch (Exception e) {
 			return null;
 		}