diff --git a/java/src/com/google/template/soy/jbcsrc/ExternCompiler.java b/java/src/com/google/template/soy/jbcsrc/ExternCompiler.java
index 672420ac8a..c30ceb0ed7 100644
--- a/java/src/com/google/template/soy/jbcsrc/ExternCompiler.java
+++ b/java/src/com/google/template/soy/jbcsrc/ExternCompiler.java
@@ -321,7 +321,7 @@ private int methodAccess() {
    * implementation.
    */
   static SoyRuntimeType getRuntimeType(SoyType type) {
-    SoyType nonNullable = SoyTypes.excludeNullish(type.getEffectiveType());
+    SoyType nonNullable = SoyTypes.excludeNull(type.getEffectiveType());
     SoyRuntimeType runtimeType =
         SoyRuntimeType.getUnboxedType(nonNullable)
             .orElseGet(() -> SoyRuntimeType.getBoxedType(nonNullable));
@@ -439,7 +439,7 @@ private static Expression adaptParameter(
       return JbcSrcExternRuntime.CONVERT_SOY_VALUE_TO_BIG_INTEGER.invoke(actualParam.box());
     }
 
-    SoyType nonNullableSoyType = SoyTypes.excludeNullish(soyType.getEffectiveType());
+    SoyType nonNullableSoyType = SoyTypes.excludeNull(soyType.getEffectiveType());
 
     // For protos, we need to unbox as Message & then cast.
     if (nonNullableSoyType instanceof MessageType) {
diff --git a/java/src/com/google/template/soy/passes/ValidateExternsPass.java b/java/src/com/google/template/soy/passes/ValidateExternsPass.java
index dde3e2eb82..3f8a2e0ac6 100644
--- a/java/src/com/google/template/soy/passes/ValidateExternsPass.java
+++ b/java/src/com/google/template/soy/passes/ValidateExternsPass.java
@@ -420,7 +420,7 @@ private static Class<?> getType(String typeName) {
 
   private boolean typesAreCompatible(
       TypeReference parameterizedType, SoyType soyType, ExternNode extern, Mode mode) {
-    return typesAreCompatible(parameterizedType, soyType, extern, mode, false);
+    return typesAreCompatible(parameterizedType, soyType, extern, mode, true);
   }
 
   private boolean typesAreCompatible(