diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java
index 149d4708beb..9efae4eab23 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java
@@ -203,8 +203,7 @@ public abstract class OverrideImplementMethodsHandler implements LanguageCodeIns
         newDescriptor.addOverriddenDescriptor(descriptor);
 
         StringBuilder body = new StringBuilder();
-        String defaultInitializer = CodeInsightUtils.defaultInitializer(descriptor.getType());
-        String initializer = defaultInitializer != null ? " = " + defaultInitializer : " = ?";
+        String initializer = " = throw UnsupportedOperationException()";
         body.append("\nget()");
         body.append(initializer);
         if (descriptor.isVar()) {
diff --git a/idea/testData/codeInsight/overrideImplement/complexMultiOverride.kt.after b/idea/testData/codeInsight/overrideImplement/complexMultiOverride.kt.after
index 99052c50bbc..19235ee2c7e 100644
--- a/idea/testData/codeInsight/overrideImplement/complexMultiOverride.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/complexMultiOverride.kt.after
@@ -22,7 +22,7 @@ class C : Base<String, C, Unit>() {
     }
 
     override val method: (String?) -> String
-        get() = ?
+        get() = throw UnsupportedOperationException()
 
     override fun toString(): String {
         return super.toString()
diff --git a/idea/testData/codeInsight/overrideImplement/functionProperty.kt.after b/idea/testData/codeInsight/overrideImplement/functionProperty.kt.after
index 64a8e185ea0..844352289c8 100644
--- a/idea/testData/codeInsight/overrideImplement/functionProperty.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/functionProperty.kt.after
@@ -4,9 +4,9 @@ trait A {
 }
 
 fun some() : A {
-    return object : A {<caret>
+    return object : A {
         override val method: () -> Unit?
-            get() = ?
+            get() = <selection><caret>throw UnsupportedOperationException()</selection>
     }
 }
 
diff --git a/idea/testData/codeInsight/overrideImplement/inheritVisibilities.kt.after b/idea/testData/codeInsight/overrideImplement/inheritVisibilities.kt.after
index ab8bb95acee..43fd44a8226 100644
--- a/idea/testData/codeInsight/overrideImplement/inheritVisibilities.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/inheritVisibilities.kt.after
@@ -24,21 +24,21 @@ class C : A(), B {
     }
 
     override val internalProperty: Int
-        get() = 0
+        get() = throw UnsupportedOperationException()
 
     override fun protectedFun() {
         super<A>.protectedFun()
     }
 
     override val protectedProperty: Int
-        get() = 0
+        get() = throw UnsupportedOperationException()
 
     override fun publicFun() {
         super<A>.publicFun()
     }
 
     override val publicProperty: Int
-        get() = 0
+        get() = throw UnsupportedOperationException()
 
     override fun toString(): String {
         return super<A>.toString()
diff --git a/idea/testData/codeInsight/overrideImplement/overrideExtensionProperty.kt.after b/idea/testData/codeInsight/overrideImplement/overrideExtensionProperty.kt.after
index 5c49b259528..20abfb78d24 100644
--- a/idea/testData/codeInsight/overrideImplement/overrideExtensionProperty.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/overrideExtensionProperty.kt.after
@@ -4,5 +4,5 @@ trait A {
 
 class B : A {
     override val String.prop: Int
-        get() = <selection><caret>0</selection>
+        get() = <selection><caret>throw UnsupportedOperationException()</selection>
 }
diff --git a/idea/testData/codeInsight/overrideImplement/overrideFunctionProperty.kt.after b/idea/testData/codeInsight/overrideImplement/overrideFunctionProperty.kt.after
index 8d318f3c0f8..ee5bd120c69 100644
--- a/idea/testData/codeInsight/overrideImplement/overrideFunctionProperty.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/overrideFunctionProperty.kt.after
@@ -3,9 +3,9 @@ open class A() {
 }
 
 fun some() : A {
-    return object : A() {<caret>
+    return object : A() {
         override val method: () -> Unit?
-            get() = ?
+            get() = <selection><caret>throw UnsupportedOperationException()</selection>
     }
 }
 
diff --git a/idea/testData/codeInsight/overrideImplement/overrideMutableExtensionProperty.kt.after b/idea/testData/codeInsight/overrideImplement/overrideMutableExtensionProperty.kt.after
index 38f8135afbd..859f2229529 100644
--- a/idea/testData/codeInsight/overrideImplement/overrideMutableExtensionProperty.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/overrideMutableExtensionProperty.kt.after
@@ -4,7 +4,7 @@ trait A {
 
 class B : A {
     override var Int.foo: Double
-        get() = <selection><caret>0.0</selection>
+        get() = <selection><caret>throw UnsupportedOperationException()</selection>
         set(value) {
         }
 }
diff --git a/idea/testData/codeInsight/overrideImplement/overridePrimitiveProperty.kt.after b/idea/testData/codeInsight/overrideImplement/overridePrimitiveProperty.kt.after
index c59049391e0..50be12ba22c 100644
--- a/idea/testData/codeInsight/overrideImplement/overridePrimitiveProperty.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/overridePrimitiveProperty.kt.after
@@ -11,19 +11,19 @@ trait T {
 
 class C : T {
     override val a1: Byte
-        get() = <selection><caret>0</selection>
+        get() = <selection><caret>throw UnsupportedOperationException()</selection>
     override val a2: Short
-        get() = 0
+        get() = throw UnsupportedOperationException()
     override val a3: Int
-        get() = 0
+        get() = throw UnsupportedOperationException()
     override val a4: Long
-        get() = 0
+        get() = throw UnsupportedOperationException()
     override val a5: Float
-        get() = 0.0f
+        get() = throw UnsupportedOperationException()
     override val a6: Double
-        get() = 0.0
+        get() = throw UnsupportedOperationException()
     override val a7: Char
-        get() = '\u0000'
+        get() = throw UnsupportedOperationException()
     override val a8: Boolean
-        get() = false
+        get() = throw UnsupportedOperationException()
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/overrideImplement/overrideRespectCaretPosition.kt.after b/idea/testData/codeInsight/overrideImplement/overrideRespectCaretPosition.kt.after
index 03b73c6ec79..0f5f0b8d802 100644
--- a/idea/testData/codeInsight/overrideImplement/overrideRespectCaretPosition.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/overrideRespectCaretPosition.kt.after
@@ -7,7 +7,7 @@ class C : A() {
     val constant = 42
     // Some comment
     override val bar: Int
-        get() = <selection><caret>0</selection>
+        get() = <selection><caret>throw UnsupportedOperationException()</selection>
 
     override fun equals(other: Any?): Boolean {
         return super.equals(other)
diff --git a/idea/testData/codeInsight/overrideImplement/property.kt.after b/idea/testData/codeInsight/overrideImplement/property.kt.after
index a3c9619fd3b..82bc29b271b 100644
--- a/idea/testData/codeInsight/overrideImplement/property.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/property.kt.after
@@ -4,5 +4,5 @@ trait T {
 
 class GC() : T {
     override val v: Int
-        get() = <selection><caret>0</selection>
+        get() = <selection><caret>throw UnsupportedOperationException()</selection>
 }
diff --git a/idea/testData/codeInsight/overrideImplement/respectCaretPosition.kt.after b/idea/testData/codeInsight/overrideImplement/respectCaretPosition.kt.after
index c9b893b88ee..2e87f3a5049 100644
--- a/idea/testData/codeInsight/overrideImplement/respectCaretPosition.kt.after
+++ b/idea/testData/codeInsight/overrideImplement/respectCaretPosition.kt.after
@@ -10,7 +10,7 @@ class SomeTest : Test {
     }
 
     override val testProp: Int
-        get() = 0
+        get() = throw UnsupportedOperationException()
 
     /**
      * test