diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java b/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java
index a74245fb92d..a94eb975a6d 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java
@@ -220,7 +220,7 @@ public class JetTypeMapper {
         if (descriptor instanceof ClassDescriptor) {
             FqNameUnsafe className = DescriptorUtils.getFqName(descriptor);
             if (className.isSafe()) {
-                known = KotlinToJavaTypesMap.getInstance().getJavaAnalog(className.toSafe(), jetType.isNullable());
+                known = KotlinToJavaTypesMap.getInstance().getJavaAnalog(className.toSafe(), TypeUtils.isNullableType(jetType));
             }
         }
 
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/when/SwitchCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/when/SwitchCodegen.java
index 9040a091e8d..78a53a7f68a 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/when/SwitchCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/when/SwitchCodegen.java
@@ -25,6 +25,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant;
 import org.jetbrains.jet.lang.resolve.constants.NullValue;
 import org.jetbrains.jet.lang.types.JetType;
+import org.jetbrains.jet.lang.types.TypeUtils;
 import org.jetbrains.org.objectweb.asm.Label;
 import org.jetbrains.org.objectweb.asm.Type;
 import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter;
@@ -135,7 +136,7 @@ abstract public class SwitchCodegen {
 
         assert subjectJetType != null : "subject type can't be null (i.e. void)";
 
-        if (subjectJetType.isNullable()) {
+        if (TypeUtils.isNullableType(subjectJetType)) {
             int nullEntryIndex = findNullEntryIndex(expression);
             Label nullLabel = nullEntryIndex == -1 ? defaultLabel : entryLabels.get(nullEntryIndex);
             Label notNullLabel = new Label();