diff --git a/src/helma/objectmodel/Property.java b/src/helma/objectmodel/Property.java
index 36662bdb..4592e903 100644
--- a/src/helma/objectmodel/Property.java
+++ b/src/helma/objectmodel/Property.java
@@ -141,7 +141,7 @@ public final class Property implements IProperty, Serializable {
 	case NODE:
 	    return nvalue.getName ();
 	case JAVAOBJECT:
-	    return jvalue.toString ();
+	    return jvalue == null ? null :  jvalue.toString ();
 	}
 	return "";
     }
diff --git a/src/helma/objectmodel/db/Property.java b/src/helma/objectmodel/db/Property.java
index a0de82c9..78f3ae0c 100644
--- a/src/helma/objectmodel/db/Property.java
+++ b/src/helma/objectmodel/db/Property.java
@@ -268,7 +268,7 @@ public final class Property implements IProperty, Serializable, Cloneable {
 	case NODE:
 	    return nhandle.getID ();
 	case JAVAOBJECT:
-	    return jvalue.toString ();
+	    return jvalue == null ? null : jvalue.toString ();
 	}
 	return "";
     }