diff --git a/src/helma/scripting/rhino/MapWrapper.java b/src/helma/scripting/rhino/MapWrapper.java
index 3027897e..db1dacc1 100644
--- a/src/helma/scripting/rhino/MapWrapper.java
+++ b/src/helma/scripting/rhino/MapWrapper.java
@@ -214,4 +214,12 @@ public class MapWrapper extends ScriptableObject {
     public String getClassName() {
         return "[MapWrapper]";
     }
+
+    public String toString() {
+        if (map == null) {
+            return "[MapWrapper{}]";
+        } else {
+            return "[MapWrapper"+map.toString()+"]";
+        }
+    }
 }