diff --git a/idea/src/org/jetbrains/jet/lang/resolve/BindingTraceContext.java b/idea/src/org/jetbrains/jet/lang/resolve/BindingTraceContext.java
index 45a44927f89..da6f721ed2c 100644
--- a/idea/src/org/jetbrains/jet/lang/resolve/BindingTraceContext.java
+++ b/idea/src/org/jetbrains/jet/lang/resolve/BindingTraceContext.java
@@ -157,7 +157,7 @@ public class BindingTraceContext implements BindingContext, BindingTrace {
     }
 
     @Override
-    public PsiElement getDeclarationPsiElement(DeclarationDescriptor descriptor) {
+    public PsiElement getDeclarationPsiElement(@NotNull DeclarationDescriptor descriptor) {
         return descriptorToDeclarations.get(descriptor.getOriginal());
     }
 
diff --git a/idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java b/idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java
index 6e905e08240..61aa8937be6 100644
--- a/idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java
+++ b/idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java
@@ -759,6 +759,11 @@ public class JetTypeInferrer {
 
         @Override
         public void visitThrowExpression(JetThrowExpression expression) {
+            JetExpression thrownExpression = expression.getThrownExpression();
+            if (thrownExpression != null) {
+                JetType type = getType(scope, thrownExpression, false);
+                // TODO : check that it inherits Throwable
+            }
             result = JetStandardClasses.getNothingType();
         }