diff --git a/src/helma/scripting/rhino/SerializationProxy.java b/src/helma/scripting/rhino/SerializationProxy.java
index c179d99f..9ad43a3a 100644
--- a/src/helma/scripting/rhino/SerializationProxy.java
+++ b/src/helma/scripting/rhino/SerializationProxy.java
@@ -80,13 +80,14 @@ class HopObjectProxy implements SerializationProxy {
 
     HopObjectProxy(HopObject obj) {
         INode n = obj.getNode();
-        if (n == null)
+        if (n == null) {
             ref = obj.getClassName();
-        else {
-            if (n instanceof helma.objectmodel.db.Node)
-                ref = new NodeHandle(((helma.objectmodel.db.Node) n).getKey());
-            else
+        } else {
+            if (n instanceof helma.objectmodel.db.Node) {
+                ref = new NodeHandle((helma.objectmodel.db.Node) n);
+            } else {
                 ref = n;
+            }
         }
         wrapped = true;
     }