diff --git a/mozilla/js/src/jsfun.c b/mozilla/js/src/jsfun.c
index ad8e0e4c54c..b1928f9996d 100644
--- a/mozilla/js/src/jsfun.c
+++ b/mozilla/js/src/jsfun.c
@@ -642,8 +642,10 @@ closure_convert(JSContext *cx, JSObject *obj, JSType type, jsval *vp)
 	proto = OBJ_GET_PROTO(cx, obj);
 	if (proto)
 	    *vp = OBJECT_TO_JSVAL(proto);
+        return JS_TRUE;
     }
-    return JS_TRUE;
+
+    return js_TryValueOf(cx, obj, type, vp);
 }
 
 static JSBool
@@ -972,7 +974,8 @@ fun_convert(JSContext *cx, JSObject *obj, JSType type, jsval *vp)
       case JSTYPE_FUNCTION:
 	*vp = OBJECT_TO_JSVAL(obj);
 	break;
-      default:;
+      default:
+        return js_TryValueOf(cx, obj, type, vp);
     }
     return JS_TRUE;
 }