diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/ContractInference.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/ContractInference.java
index a1c908837ad0..75f49f6bc97a 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/ContractInference.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/ContractInference.java
@@ -71,7 +71,21 @@ class ContractInferenceInterpreter {
     if (statements.length == 1) {
       if (statements[0] instanceof PsiReturnStatement) {
         List<MethodContract> result = handleDelegation(((PsiReturnStatement)statements[0]).getReturnValue(), false);
-        if (result != null) return result;
+        if (result != null) {
+          return ContainerUtil.findAll(result, new Condition<MethodContract>() {
+            @Override
+            public boolean value(MethodContract contract) {
+              if (contract.returnValue == NULL_VALUE || contract.returnValue == NOT_NULL_VALUE) {
+                PsiTypeElement typeElement = myMethod.getReturnTypeElement();
+                if (typeElement == null || !(typeElement.getType() instanceof PsiClassType)) {
+                  return false;
+                }
+              }
+
+              return true;
+            }
+          });
+        }
       }
       else if (statements[0] instanceof PsiExpressionStatement && ((PsiExpressionStatement)statements[0]).getExpression() instanceof PsiMethodCallExpression) {
         List<MethodContract> result = handleDelegation(((PsiExpressionStatement)statements[0]).getExpression(), false);
diff --git a/java/java-tests/testSrc/com/intellij/codeInspection/ContractInferenceFromSourceTest.groovy b/java/java-tests/testSrc/com/intellij/codeInspection/ContractInferenceFromSourceTest.groovy
index 23eac589e2db..d17b83bf4416 100644
--- a/java/java-tests/testSrc/com/intellij/codeInspection/ContractInferenceFromSourceTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInspection/ContractInferenceFromSourceTest.groovy
@@ -228,6 +228,22 @@ class ContractInferenceFromSourceTest extends LightCodeInsightFixtureTestCase {
     assert c == []
   }
 
+  public void "test boolean auto-unboxing"() {
+    def c = inferContracts("""
+      static boolean test02(String s) {
+          return test01(s);
+      }
+
+      static Boolean test01(String s) {
+          if (s == null)
+              return new Boolean(false);
+          else
+             return null;
+      }
+    """)
+    assert c == []
+  }
+
   public void "test non-returning delegation"() {
     def c = inferContracts("""
     static void test2(Object o) {