diff --git a/java/java-impl/src/com/intellij/psi/impl/PsiVariableEx.java b/java/java-impl/src/com/intellij/psi/impl/PsiVariableEx.java
index d5aeedcaa133..7e525bc2a234 100644
--- a/java/java-impl/src/com/intellij/psi/impl/PsiVariableEx.java
+++ b/java/java-impl/src/com/intellij/psi/impl/PsiVariableEx.java
@@ -15,10 +15,12 @@
  */
 package com.intellij.psi.impl;
 
-import com.intellij.psi.*;
+import com.intellij.psi.PsiVariable;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Set;
 
-public interface PsiVariableEx extends PsiVariable{
+public interface PsiVariableEx extends PsiVariable {
+  @Nullable
   Object computeConstantValue(Set<PsiVariable> visitedVars);
 }
diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsFieldImpl.java b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsFieldImpl.java
index 07f043c77e3a..f5bb53a64d0d 100644
--- a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsFieldImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsFieldImpl.java
@@ -154,7 +154,8 @@ public class ClsFieldImpl extends ClsRepositoryPsiElement<PsiFieldStub> implemen
     PsiExpression initializer = getInitializer();
     if (initializer == null) return null;
 
-    final String qName = getContainingClass().getQualifiedName();
+    final PsiClass containingClass = getContainingClass();
+    final String qName = containingClass != null ? containingClass.getQualifiedName() : null;
     if ("java.lang.Float".equals(qName)) {
       @NonNls final String name = getName();
       if ("POSITIVE_INFINITY".equals(name)) return new Float(Float.POSITIVE_INFINITY);