--- a/dom/bindings/Codegen.py
+++ b/dom/bindings/Codegen.py
@@ -3259,19 +3259,19 @@ if (!%(resultStr)s) {
         # See comments in WrapNewBindingObject explaining why we need
         # to wrap here.
         # NB: setValue(..., True) calls JS_WrapValue(), so is fallible
         if descriptorProvider.workers:
             return (setValue("JS::ObjectOrNullValue(%s)" % result, True), False)
 
         wrapCode = (("if (%(result)s) {\n" +
                      CGIndenter(CGGeneric(setValue(
-                            "JS::ObjectValue(*%(result)s->Callable())", True))).define() +
+                            "JS::ObjectValue(*%(result)s->Callable())", True))).define() + "\n"
                      "} else {\n" +
-                     setValue("JS::NullValue()") +
+                     CGIndenter(CGGeneric(setValue("JS::NullValue()"))).define() + "\n"
                      "}") % { "result": result })
         return wrapCode, False
 
     if type.tag() == IDLType.Tags.any:
         # See comments in WrapNewBindingObject explaining why we need
         # to wrap here.
         # NB: setValue(..., True) calls JS_WrapValue(), so is fallible
         return (setValue(result, True), False)