diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExceptionLogger.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExceptionLogger.kt
new file mode 100644
index 00000000000..946732271cb
--- /dev/null
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExceptionLogger.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2010-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.codegen
+
+import com.intellij.openapi.diagnostic.Logger
+import com.intellij.psi.PsiElement
+import org.jetbrains.kotlin.psi.psiUtil.getElementTextWithContext
+
+object ExceptionLogger {
+    @JvmStatic
+    fun logDescriptorNotFound(problemDescription: String, psi: PsiElement): AssertionError {
+        LOG.error(problemDescription, psi.getElementTextWithContext())
+        throw AssertionError(problemDescription)
+    }
+
+    private val LOG = Logger.getInstance(ExceptionLogger::class.java)
+}
\ No newline at end of file
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java
index 7eb6963830d..aeabebcad1f 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2010-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -100,9 +100,9 @@ public class PropertyCodegen {
     public void gen(@NotNull KtProperty property) {
         VariableDescriptor variableDescriptor = bindingContext.get(BindingContext.VARIABLE, property);
         if (!(variableDescriptor instanceof PropertyDescriptor)) {
-            String problem = "Property " + property.getName() + " should have a property descriptor: " + variableDescriptor;
-            LOG.error(problem, PsiUtilsKt.getElementTextWithContext(property));
-            throw new AssertionError(problem);
+            throw ExceptionLogger.logDescriptorNotFound(
+                    "Property " + property.getName() + " should have a property descriptor: " + variableDescriptor, property
+            );
         }
 
         PropertyDescriptor propertyDescriptor = (PropertyDescriptor) variableDescriptor;