diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/NamespaceType.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/NamespaceType.java
index 1fbbcdd91a2..e75c88ddf21 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/types/NamespaceType.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/NamespaceType.java
@@ -64,7 +64,6 @@ public class NamespaceType implements JetType {
 
     @Override
     public boolean isNullable() {
-        throwException();
         return false;
     }
 
diff --git a/compiler/testData/diagnostics/tests/SafeCallOnFakeNamespace.kt b/compiler/testData/diagnostics/tests/SafeCallOnFakeNamespace.kt
new file mode 100644
index 00000000000..8e56bae4c42
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/SafeCallOnFakeNamespace.kt
@@ -0,0 +1,10 @@
+// FILE: Test.java
+public class Test {
+    public static final String FOO = "test";
+}
+
+// FILE: test.kt
+fun ff() {
+    val a = Test?.FOO
+    System?.out.println(a)
+}
diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
index 74dfbb6f151..ddbc790f19f 100644
--- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
@@ -421,6 +421,11 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
             doTest("compiler/testData/diagnostics/tests/SafeCallNonNullReceiverReturnNull.kt");
         }
         
+        @TestMetadata("SafeCallOnFakeNamespace.kt")
+        public void testSafeCallOnFakeNamespace() throws Exception {
+            doTest("compiler/testData/diagnostics/tests/SafeCallOnFakeNamespace.kt");
+        }
+        
         @TestMetadata("ShiftFunctionTypes.kt")
         public void testShiftFunctionTypes() throws Exception {
             doTest("compiler/testData/diagnostics/tests/ShiftFunctionTypes.kt");