diff --git a/AppKit/CPBrowser.j b/AppKit/CPBrowser.j
index 9429a1fe1..8492a2898 100644
--- a/AppKit/CPBrowser.j
+++ b/AppKit/CPBrowser.j
@@ -463,7 +463,7 @@ var CPBrowserDelegate_browser_acceptDrop_atRow_column_dropOperation_
 
 - (id)itemAtRow:(CPInteger)row inColumn:(CPInteger)column
 {
-    return [_tableDelegates[column] childAtIndex:row];
+    return [_tableDelegates[column] childAtIndex:row] || nil;
 }
 
 - (BOOL)isLeafItem:(id)item
@@ -473,7 +473,7 @@ var CPBrowserDelegate_browser_acceptDrop_atRow_column_dropOperation_
 
 - (id)parentForItemsInColumn:(CPInteger)column
 {
-    return [_tableDelegates[column] _item];
+    return [_tableDelegates[column] _item] || nil;
 }
 
 - (CPSet)selectedItems
diff --git a/Objective-J/ObjJAcornCompiler.js b/Objective-J/ObjJAcornCompiler.js
index 61aa59da4..3b7ea4624 100644
--- a/Objective-J/ObjJAcornCompiler.js
+++ b/Objective-J/ObjJAcornCompiler.js
@@ -2447,7 +2447,9 @@ ArrayLiteral: function(node, st, c) {
             buffer.concat(++st.receiverLevel + "");
             buffer.concat(" = (CPArray.isa.method_msgSend[\"alloc\"] || _objj_forward)(CPArray, \"alloc\"), ___r");
             buffer.concat(st.receiverLevel + "");
-            buffer.concat(" == null ? null : (___r");
+            buffer.concat(" == null ? ___r");
+            buffer.concat(st.receiverLevel + "");
+            buffer.concat(" : (___r");
             buffer.concat(st.receiverLevel + "");
             buffer.concat(".isa.method_msgSend[\"init\"] || _objj_forward)(___r");
             buffer.concat(st.receiverLevel + "");
@@ -2457,7 +2459,9 @@ ArrayLiteral: function(node, st, c) {
             buffer.concat(++st.receiverLevel + "");
             buffer.concat(" = CPArray.isa.objj_msgSend0(CPArray, \"alloc\"), ___r");
             buffer.concat(st.receiverLevel + "");
-            buffer.concat(" == null ? null : ___r");
+            buffer.concat(" == null ? ___r");
+            buffer.concat(st.receiverLevel + "");
+            buffer.concat(" : ___r");
             buffer.concat(st.receiverLevel + "");
             buffer.concat(".isa.objj_msgSend0(___r");
             buffer.concat(st.receiverLevel + "");
@@ -2472,7 +2476,9 @@ ArrayLiteral: function(node, st, c) {
             buffer.concat(++st.receiverLevel + "");
             buffer.concat(" = (CPArray.isa.method_msgSend[\"alloc\"] || _objj_forward)(CPArray, \"alloc\"), ___r");
             buffer.concat(st.receiverLevel + "");
-            buffer.concat(" == null ? null : (___r");
+            buffer.concat(" == null ? ___r");
+            buffer.concat(st.receiverLevel + "");
+            buffer.concat(" : (___r");
             buffer.concat(st.receiverLevel + "");
             buffer.concat(".isa.method_msgSend[\"initWithObjects:count:\"] || _objj_forward)(___r");
             buffer.concat(st.receiverLevel + "");
@@ -2482,7 +2488,9 @@ ArrayLiteral: function(node, st, c) {
             buffer.concat(++st.receiverLevel + "");
             buffer.concat(" = CPArray.isa.objj_msgSend0(CPArray, \"alloc\"), ___r");
             buffer.concat(st.receiverLevel + "");
-            buffer.concat(" == null ? null : ___r");
+            buffer.concat(" == null ? ___r");
+            buffer.concat(st.receiverLevel + "");
+            buffer.concat(" : ___r");
             buffer.concat(st.receiverLevel + "");
             buffer.concat(".isa.objj_msgSend2(___r");
             buffer.concat(st.receiverLevel + "");
@@ -2541,7 +2549,9 @@ DictionaryLiteral: function(node, st, c) {
             buffer.concat(++st.receiverLevel + "");
             buffer.concat(" = (CPDictionary.isa.method_msgSend[\"alloc\"] || _objj_forward)(CPDictionary, \"alloc\"), ___r");
             buffer.concat(st.receiverLevel + "");
-            buffer.concat(" == null ? null : (___r");
+            buffer.concat(" == null ? ___r");
+            buffer.concat(st.receiverLevel + "");
+            buffer.concat(" : (___r");
             buffer.concat(st.receiverLevel + "");
             buffer.concat(".isa.method_msgSend[\"init\"] || _objj_forward)(___r");
             buffer.concat(st.receiverLevel + "");
@@ -2551,7 +2561,9 @@ DictionaryLiteral: function(node, st, c) {
             buffer.concat(++st.receiverLevel + "");
             buffer.concat(" = CPDictionary.isa.objj_msgSend0(CPDictionary, \"alloc\"), ___r");
             buffer.concat(st.receiverLevel + "");
-            buffer.concat(" == null ? null : ___r");
+            buffer.concat(" == null ? ___r");
+            buffer.concat(st.receiverLevel + "");
+            buffer.concat(" : ___r");
             buffer.concat(st.receiverLevel + "");
             buffer.concat(".isa.objj_msgSend0(___r");
             buffer.concat(st.receiverLevel + "");
@@ -2566,7 +2578,9 @@ DictionaryLiteral: function(node, st, c) {
             buffer.concat(++st.receiverLevel + "");
             buffer.concat(" = (CPDictionary.isa.method_msgSend[\"alloc\"] || _objj_forward)(CPDictionary, \"alloc\"), ___r");
             buffer.concat(st.receiverLevel + "");
-            buffer.concat(" == null ? null : (___r");
+            buffer.concat(" == null ? ___r");
+            buffer.concat(st.receiverLevel + "");
+            buffer.concat(" : (___r");
             buffer.concat(st.receiverLevel + "");
             buffer.concat(".isa.method_msgSend[\"initWithObjects:forKeys:\"] || _objj_forward)(___r");
             buffer.concat(st.receiverLevel + "");
@@ -2576,7 +2590,9 @@ DictionaryLiteral: function(node, st, c) {
             buffer.concat(++st.receiverLevel + "");
             buffer.concat(" = CPDictionary.isa.objj_msgSend0(CPDictionary, \"alloc\"), ___r");
             buffer.concat(st.receiverLevel + "");
-            buffer.concat(" == null ? null : ___r");
+            buffer.concat(" == null ? ___r");
+            buffer.concat(st.receiverLevel + "");
+            buffer.concat(" : ___r");
             buffer.concat(st.receiverLevel + "");
             buffer.concat(".isa.objj_msgSend2(___r");
             buffer.concat(st.receiverLevel + "");
@@ -3408,7 +3424,9 @@ MessageSendExpression: function(node, st, c) {
                 if (receiverIsNotSelf) {
                     buffer.concat("(", node);
                     c(nodeObject, st, "Expression");
-                    buffer.concat(" == null ? null : ", node);
+                    buffer.concat(" == null ? ", node);
+                    c(nodeObject, st, "Expression");
+                    buffer.concat(" : ", node);
                 }
                 if (inlineMsgSend)
                     buffer.concat("(", node);
@@ -3421,7 +3439,9 @@ MessageSendExpression: function(node, st, c) {
                 c(nodeObject, st, "Expression");
                 buffer.concat(")", node);
                 buffer.concat(", ___r" + st.receiverLevel, node);
-                buffer.concat(" == null ? null : ", node);
+                buffer.concat(" == null ? ", node);
+                buffer.concat("___r" + st.receiverLevel, node);
+                buffer.concat(" : ", node);
                 if (inlineMsgSend)
                     buffer.concat("(", node);
                 buffer.concat("___r" + st.receiverLevel, node);
diff --git a/Objective-J/Runtime.js b/Objective-J/Runtime.js
index 3d9e04440..08ddfedb6 100644
--- a/Objective-J/Runtime.js
+++ b/Objective-J/Runtime.js
@@ -838,7 +838,7 @@ var __objj_msgSend__StackDepth = 0;
 GLOBAL(objj_msgSend) = function(/*id*/ aReceiver, /*SEL*/ aSelector)
 {
     if (aReceiver == nil)
-        return nil;
+        return aReceiver;
 
     var isa = aReceiver.isa;
 
diff --git a/Tests/Objective-J/Preprocessor/BehaviorTests/MethodTest.j b/Tests/Objective-J/Preprocessor/BehaviorTests/MethodTest.j
index 7df299459..57496f48c 100644
--- a/Tests/Objective-J/Preprocessor/BehaviorTests/MethodTest.j
+++ b/Tests/Objective-J/Preprocessor/BehaviorTests/MethodTest.j
@@ -41,6 +41,16 @@
     return anotherNumber - aNumber;
 }
 
+-(id)nil
+{
+    return nil;
+}
+
+-(id)undefined
+{
+    return undefined;
+}
+
 @end
 
 @implementation MethodTest : OJTestCase
@@ -135,4 +145,14 @@
     [self assert:method_getNumberOfArguments(method) equals:3];
 }
 
+- (void)testReturnNil
+{
+    [self assert:[[testClass nil] someSelector] equals:null];
+}
+
+- (void)testReturnUndefined
+{
+    [self assert:[[testClass undefined] someSelector] equals:undefined];
+}
+
 @end
diff --git a/Tests/Objective-J/Preprocessor/OutputTests/Messages/colon-selector-inlined.js b/Tests/Objective-J/Preprocessor/OutputTests/Messages/colon-selector-inlined.js
index bae53d471..db2d9e673 100644
--- a/Tests/Objective-J/Preprocessor/OutputTests/Messages/colon-selector-inlined.js
+++ b/Tests/Objective-J/Preprocessor/OutputTests/Messages/colon-selector-inlined.js
@@ -1,2 +1,2 @@
 
-(object==null?null:(object.isa.method_msgSend[":"]||_objj_forward)(object,":",argument));
\ No newline at end of file
+(object==null?object:(object.isa.method_msgSend[":"]||_objj_forward)(object,":",argument));
\ No newline at end of file
diff --git a/Tests/Objective-J/Preprocessor/OutputTests/Messages/colon-selector.js b/Tests/Objective-J/Preprocessor/OutputTests/Messages/colon-selector.js
index 1104fd603..c7720a5f8 100644
--- a/Tests/Objective-J/Preprocessor/OutputTests/Messages/colon-selector.js
+++ b/Tests/Objective-J/Preprocessor/OutputTests/Messages/colon-selector.js
@@ -1,2 +1,2 @@
 
-(object==null?null:object.isa.objj_msgSend1(object,":",argument));
\ No newline at end of file
+(object==null?object:object.isa.objj_msgSend1(object,":",argument));
\ No newline at end of file
diff --git a/Tests/Objective-J/Preprocessor/OutputTests/Messages/complex-receiver-inlined.js b/Tests/Objective-J/Preprocessor/OutputTests/Messages/complex-receiver-inlined.js
index b629b2a0b..d858573ec 100644
--- a/Tests/Objective-J/Preprocessor/OutputTests/Messages/complex-receiver-inlined.js
+++ b/Tests/Objective-J/Preprocessor/OutputTests/Messages/complex-receiver-inlined.js
@@ -1,2 +1,2 @@
 var a=0;
-((___r1=a++<2?small_target:big_target),___r1==null?null:(___r1.isa.method_msgSend["doStuff"]||_objj_forward)(___r1,"doStuff"));
+((___r1=a++<2?small_target:big_target),___r1==null?___r1:(___r1.isa.method_msgSend["doStuff"]||_objj_forward)(___r1,"doStuff"));
diff --git a/Tests/Objective-J/Preprocessor/OutputTests/Messages/complex-receiver.js b/Tests/Objective-J/Preprocessor/OutputTests/Messages/complex-receiver.js
index 1ed012c6d..d7d785818 100644
--- a/Tests/Objective-J/Preprocessor/OutputTests/Messages/complex-receiver.js
+++ b/Tests/Objective-J/Preprocessor/OutputTests/Messages/complex-receiver.js
@@ -1,2 +1,2 @@
 var a=0;
-((___r1=a++<2?small_target:big_target),___r1==null?null:___r1.isa.objj_msgSend0(___r1,"doStuff"));
+((___r1=a++<2?small_target:big_target),___r1==null?___r1:___r1.isa.objj_msgSend0(___r1,"doStuff"));
diff --git a/Tests/Objective-J/Preprocessor/OutputTests/Messages/keyword-in-selector-inlined.js b/Tests/Objective-J/Preprocessor/OutputTests/Messages/keyword-in-selector-inlined.js
index fe6d6d930..cc7b65cf7 100644
--- a/Tests/Objective-J/Preprocessor/OutputTests/Messages/keyword-in-selector-inlined.js
+++ b/Tests/Objective-J/Preprocessor/OutputTests/Messages/keyword-in-selector-inlined.js
@@ -1 +1 @@
-(object==null?null:(object.isa.method_msgSend["for:in:nil:"]||_objj_forward)(object,"for:in:nil:",a,b,nil));
\ No newline at end of file
+(object==null?object:(object.isa.method_msgSend["for:in:nil:"]||_objj_forward)(object,"for:in:nil:",a,b,nil));
\ No newline at end of file
diff --git a/Tests/Objective-J/Preprocessor/OutputTests/Messages/keyword-in-selector.js b/Tests/Objective-J/Preprocessor/OutputTests/Messages/keyword-in-selector.js
index 8e4bc3bda..b47750cb7 100644
--- a/Tests/Objective-J/Preprocessor/OutputTests/Messages/keyword-in-selector.js
+++ b/Tests/Objective-J/Preprocessor/OutputTests/Messages/keyword-in-selector.js
@@ -1 +1 @@
-(object==null?null:object.isa.objj_msgSend3(object,"for:in:nil:",a,b,nil));
\ No newline at end of file
+(object==null?object:object.isa.objj_msgSend3(object,"for:in:nil:",a,b,nil));
\ No newline at end of file
diff --git a/Tests/Objective-J/Preprocessor/OutputTests/Messages/multiple-parameters-inlined.js b/Tests/Objective-J/Preprocessor/OutputTests/Messages/multiple-parameters-inlined.js
index a28089dda..5b74f7de6 100644
--- a/Tests/Objective-J/Preprocessor/OutputTests/Messages/multiple-parameters-inlined.js
+++ b/Tests/Objective-J/Preprocessor/OutputTests/Messages/multiple-parameters-inlined.js
@@ -1,2 +1,2 @@
 
-(object==null?null:(object.isa.method_msgSend["label:label2:label3:label4:"]||_objj_forward)(object,"label:label2:label3:label4:",argument,argument2,argument3,argument4));
+(object==null?object:(object.isa.method_msgSend["label:label2:label3:label4:"]||_objj_forward)(object,"label:label2:label3:label4:",argument,argument2,argument3,argument4));
diff --git a/Tests/Objective-J/Preprocessor/OutputTests/Messages/multiple-parameters.js b/Tests/Objective-J/Preprocessor/OutputTests/Messages/multiple-parameters.js
index 4c55b7aef..4d5a7d7da 100644
--- a/Tests/Objective-J/Preprocessor/OutputTests/Messages/multiple-parameters.js
+++ b/Tests/Objective-J/Preprocessor/OutputTests/Messages/multiple-parameters.js
@@ -1,2 +1,2 @@
 
-(object==null?null:object.isa.objj_msgSend(object,"label:label2:label3:label4:",argument,argument2,argument3,argument4));
+(object==null?object:object.isa.objj_msgSend(object,"label:label2:label3:label4:",argument,argument2,argument3,argument4));
diff --git a/Tests/Objective-J/Preprocessor/OutputTests/Messages/no-parameters-inlined.js b/Tests/Objective-J/Preprocessor/OutputTests/Messages/no-parameters-inlined.js
index 50c8b1a87..50aa87d81 100644
--- a/Tests/Objective-J/Preprocessor/OutputTests/Messages/no-parameters-inlined.js
+++ b/Tests/Objective-J/Preprocessor/OutputTests/Messages/no-parameters-inlined.js
@@ -1,2 +1,2 @@
 (CPArray.isa.method_msgSend["new"]||_objj_forward)(CPArray,"new");
-(object==null?null:(object.isa.method_msgSend["message"]||_objj_forward)(object,"message"));
\ No newline at end of file
+(object==null?object:(object.isa.method_msgSend["message"]||_objj_forward)(object,"message"));
\ No newline at end of file
diff --git a/Tests/Objective-J/Preprocessor/OutputTests/Messages/no-parameters.js b/Tests/Objective-J/Preprocessor/OutputTests/Messages/no-parameters.js
index 023c09bdf..0cedb887c 100644
--- a/Tests/Objective-J/Preprocessor/OutputTests/Messages/no-parameters.js
+++ b/Tests/Objective-J/Preprocessor/OutputTests/Messages/no-parameters.js
@@ -1,2 +1,2 @@
 CPArray.isa.objj_msgSend0(CPArray,"new");
-(object==null?null:object.isa.objj_msgSend0(object,"message"));
\ No newline at end of file
+(object==null?object:object.isa.objj_msgSend0(object,"message"));
\ No newline at end of file
diff --git a/Tests/Objective-J/Preprocessor/OutputTests/Messages/one-parameter-inlined.js b/Tests/Objective-J/Preprocessor/OutputTests/Messages/one-parameter-inlined.js
index 970155db6..8ce3f29a8 100644
--- a/Tests/Objective-J/Preprocessor/OutputTests/Messages/one-parameter-inlined.js
+++ b/Tests/Objective-J/Preprocessor/OutputTests/Messages/one-parameter-inlined.js
@@ -1,2 +1,2 @@
 (CPArray.isa.method_msgSend["arrayWithArray:"]||_objj_forward)(CPArray,"arrayWithArray:",[]);
-(object==null?null:(object.isa.method_msgSend["label:"]||_objj_forward)(object,"label:",argument));
\ No newline at end of file
+(object==null?object:(object.isa.method_msgSend["label:"]||_objj_forward)(object,"label:",argument));
\ No newline at end of file
diff --git a/Tests/Objective-J/Preprocessor/OutputTests/Messages/one-parameter.js b/Tests/Objective-J/Preprocessor/OutputTests/Messages/one-parameter.js
index b8795333c..83d677cd1 100644
--- a/Tests/Objective-J/Preprocessor/OutputTests/Messages/one-parameter.js
+++ b/Tests/Objective-J/Preprocessor/OutputTests/Messages/one-parameter.js
@@ -1,2 +1,2 @@
 CPArray.isa.objj_msgSend1(CPArray,"arrayWithArray:",[]);
-(object==null?null:object.isa.objj_msgSend1(object,"label:",argument));
\ No newline at end of file
+(object==null?object:object.isa.objj_msgSend1(object,"label:",argument));
\ No newline at end of file
diff --git a/Tests/Objective-J/Preprocessor/OutputTests/Messages/self-as-receiver-inlined.js b/Tests/Objective-J/Preprocessor/OutputTests/Messages/self-as-receiver-inlined.js
index 1235ab1bc..4b7319679 100644
--- a/Tests/Objective-J/Preprocessor/OutputTests/Messages/self-as-receiver-inlined.js
+++ b/Tests/Objective-J/Preprocessor/OutputTests/Messages/self-as-receiver-inlined.js
@@ -3,9 +3,9 @@ objj_registerClassPair(the_class);
 class_addMethods(the_class,[new objj_method(sel_getUid("mySelector"),function $MyClass__mySelector(_1,_2){
 (_1.isa.method_msgSend["init"]||_objj_forward)(_1,"init");
 _1=nil;
-(_1==null?null:(_1.isa.method_msgSend["init"]||_objj_forward)(_1,"init"));
+(_1==null?_1:(_1.isa.method_msgSend["init"]||_objj_forward)(_1,"init"));
 },["id"]),new objj_method(sel_getUid("mySelector2"),function $MyClass__mySelector2(_3,_4){
 (_3.isa.method_msgSend["init"]||_objj_forward)(_3,"init");
 eval("self = null;");
-(_3==null?null:(_3.isa.method_msgSend["init"]||_objj_forward)(_3,"init"));
+(_3==null?_3:(_3.isa.method_msgSend["init"]||_objj_forward)(_3,"init"));
 },["id"])]);
\ No newline at end of file
diff --git a/Tests/Objective-J/Preprocessor/OutputTests/Messages/self-as-receiver.js b/Tests/Objective-J/Preprocessor/OutputTests/Messages/self-as-receiver.js
index 561ad60cb..440812342 100644
--- a/Tests/Objective-J/Preprocessor/OutputTests/Messages/self-as-receiver.js
+++ b/Tests/Objective-J/Preprocessor/OutputTests/Messages/self-as-receiver.js
@@ -3,9 +3,9 @@ objj_registerClassPair(the_class);
 class_addMethods(the_class,[new objj_method(sel_getUid("mySelector"),function $MyClass__mySelector(_1,_2){
 _1.isa.objj_msgSend0(_1,"init");
 _1=nil;
-(_1==null?null:_1.isa.objj_msgSend0(_1,"init"));
+(_1==null?_1:_1.isa.objj_msgSend0(_1,"init"));
 },["id"]),new objj_method(sel_getUid("mySelector2"),function $MyClass__mySelector2(_3,_4){
 _3.isa.objj_msgSend0(_3,"init");
 eval("self = null;");
-(_3==null?null:_3.isa.objj_msgSend0(_3,"init"));
+(_3==null?_3:_3.isa.objj_msgSend0(_3,"init"));
 },["id"])]);
\ No newline at end of file
diff --git a/Tests/Objective-J/Preprocessor/OutputTests/Messages/ternary-operator-argument-inlined.js b/Tests/Objective-J/Preprocessor/OutputTests/Messages/ternary-operator-argument-inlined.js
index e3159dd7c..bb0782f30 100644
--- a/Tests/Objective-J/Preprocessor/OutputTests/Messages/ternary-operator-argument-inlined.js
+++ b/Tests/Objective-J/Preprocessor/OutputTests/Messages/ternary-operator-argument-inlined.js
@@ -1,4 +1,4 @@
 
-(object==null?null:(object.isa.method_msgSend["label:"]||_objj_forward)(object,"label:",condition?true:false));
-(object==null?null:(object.isa.method_msgSend["label:"]||_objj_forward)(object,"label:",condition?true:false));
-(object==null?null:(object.isa.method_msgSend["label:"]||_objj_forward)(object,"label:",condition?true:false));
+(object==null?object:(object.isa.method_msgSend["label:"]||_objj_forward)(object,"label:",condition?true:false));
+(object==null?object:(object.isa.method_msgSend["label:"]||_objj_forward)(object,"label:",condition?true:false));
+(object==null?object:(object.isa.method_msgSend["label:"]||_objj_forward)(object,"label:",condition?true:false));
diff --git a/Tests/Objective-J/Preprocessor/OutputTests/Messages/ternary-operator-argument.js b/Tests/Objective-J/Preprocessor/OutputTests/Messages/ternary-operator-argument.js
index f879e332c..341d93f5e 100644
--- a/Tests/Objective-J/Preprocessor/OutputTests/Messages/ternary-operator-argument.js
+++ b/Tests/Objective-J/Preprocessor/OutputTests/Messages/ternary-operator-argument.js
@@ -1,4 +1,4 @@
 
-(object==null?null:object.isa.objj_msgSend1(object,"label:",condition?true:false));
-(object==null?null:object.isa.objj_msgSend1(object,"label:",condition?true:false));
-(object==null?null:object.isa.objj_msgSend1(object,"label:",condition?true:false));
+(object==null?object:object.isa.objj_msgSend1(object,"label:",condition?true:false));
+(object==null?object:object.isa.objj_msgSend1(object,"label:",condition?true:false));
+(object==null?object:object.isa.objj_msgSend1(object,"label:",condition?true:false));
diff --git a/Tests/Objective-J/Preprocessor/OutputTests/Misc/parenthesis-return-inlined.js b/Tests/Objective-J/Preprocessor/OutputTests/Misc/parenthesis-return-inlined.js
index 523b97db5..24cb664e2 100644
--- a/Tests/Objective-J/Preprocessor/OutputTests/Misc/parenthesis-return-inlined.js
+++ b/Tests/Objective-J/Preprocessor/OutputTests/Misc/parenthesis-return-inlined.js
@@ -1,3 +1,3 @@
 x=function(){
-return (someIval==null?null:(someIval.isa.method_msgSend["someMethod"]||_objj_forward)(someIval,"someMethod"));
+return (someIval==null?someIval:(someIval.isa.method_msgSend["someMethod"]||_objj_forward)(someIval,"someMethod"));
 };
diff --git a/Tests/Objective-J/Preprocessor/OutputTests/Misc/parenthesis-return.js b/Tests/Objective-J/Preprocessor/OutputTests/Misc/parenthesis-return.js
index 4b3da9ec7..c832a30bf 100644
--- a/Tests/Objective-J/Preprocessor/OutputTests/Misc/parenthesis-return.js
+++ b/Tests/Objective-J/Preprocessor/OutputTests/Misc/parenthesis-return.js
@@ -1,3 +1,3 @@
 x=function(){
-return (someIval==null?null:someIval.isa.objj_msgSend0(someIval,"someMethod"));
+return (someIval==null?someIval:someIval.isa.objj_msgSend0(someIval,"someMethod"));
 };