diff --git a/user/src/com/google/gwt/user/rebind/rpc/TypeSerializerCreator.java b/user/src/com/google/gwt/user/rebind/rpc/TypeSerializerCreator.java
index c1c0a1f..b6bb303 100644
--- a/user/src/com/google/gwt/user/rebind/rpc/TypeSerializerCreator.java
+++ b/user/src/com/google/gwt/user/rebind/rpc/TypeSerializerCreator.java
@@ -413,7 +413,7 @@
       srcWriter.indent();
       srcWriter.println("var signature = @" + serializerTypeName
           + "::signatureMap[typeName];");
-      srcWriter.println("return (signature == null) ? typeName : signature;");
+      srcWriter.println("return signature || null;");
       srcWriter.outdent();
       srcWriter.println("}-*/;");
     }