Index: sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/java/JavaGenerator.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/java/JavaGenerator.java	(revision 0a51bb71bc9f1aa804de269e01d6ad5ad2e2b087)
+++ sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/java/JavaGenerator.java	(date 1572291699560)
@@ -1476,17 +1476,13 @@
             final String name = token.name();
             sb.append("            case ").append(constStr).append(": return ").append(name).append(";\n");
         }
-
+        final String nullValue = tokens.get(0).encoding().applicableNullValue().toString();
+        sb.append("            case ").append(nullValue).append(": return NULL_VAL").append(";\n");
         final String handleUnknownLogic = shouldDecodeUnknownEnumValues ?
             INDENT + INDENT + "return SBE_UNKNOWN;\n" :
             INDENT + INDENT + "throw new IllegalArgumentException(\"Unknown value: \" + value);\n";
 
-        final String nullValue = tokens.get(0).encoding().applicableNullValue().toString();
         sb.append("        }\n\n")
-            .append("        if (").append(generateLiteral(primitiveType, nullValue)).append(" == value)\n")
-            .append("        {\n")
-            .append("            return NULL_VAL;\n")
-            .append("        }\n\n")
             .append(handleUnknownLogic)
             .append("    }\n");