diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/KtNamedFunction.java b/compiler/psi/src/org/jetbrains/kotlin/psi/KtNamedFunction.java
index 002d189dc0f..a1d0e8d015a 100644
--- a/compiler/psi/src/org/jetbrains/kotlin/psi/KtNamedFunction.java
+++ b/compiler/psi/src/org/jetbrains/kotlin/psi/KtNamedFunction.java
@@ -133,6 +133,22 @@ public class KtNamedFunction extends KtTypeParameterListOwnerStub<KotlinFunction
         );
     }
 
+    @Nullable
+    @Override
+    public KtBlockExpression getBodyBlockExpression() {
+        KotlinFunctionStub stub = getStub();
+        if (stub != null && !(stub.hasBlockBody() && stub.hasBody())) {
+            return null;
+        }
+
+        KtExpression bodyExpression = findChildByClass(KtExpression.class);
+        if (bodyExpression instanceof KtBlockExpression) {
+            return (KtBlockExpression) bodyExpression;
+        }
+
+        return null;
+    }
+
     @Override
     public boolean hasBody() {
         KotlinFunctionStub stub = getStub();
diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/KtPropertyAccessor.java b/compiler/psi/src/org/jetbrains/kotlin/psi/KtPropertyAccessor.java
index 73a3b0fabc1..c5d0e385479 100644
--- a/compiler/psi/src/org/jetbrains/kotlin/psi/KtPropertyAccessor.java
+++ b/compiler/psi/src/org/jetbrains/kotlin/psi/KtPropertyAccessor.java
@@ -97,6 +97,22 @@ public class KtPropertyAccessor extends KtDeclarationStub<KotlinPropertyAccessor
         );
     }
 
+    @Nullable
+    @Override
+    public KtBlockExpression getBodyBlockExpression() {
+        KotlinPropertyAccessorStub stub = getStub();
+        if (stub != null && !(stub.hasBlockBody() && stub.hasBody())) {
+            return null;
+        }
+
+        KtExpression bodyExpression = findChildByClass(KtExpression.class);
+        if (bodyExpression instanceof KtBlockExpression) {
+            return (KtBlockExpression) bodyExpression;
+        }
+
+        return null;
+    }
+
     @Override
     public boolean hasBlockBody() {
         KotlinPropertyAccessorStub stub = getStub();