diff --git a/java/execution/impl/src/com/intellij/execution/stacktrace/StackTraceLine.java b/java/execution/impl/src/com/intellij/execution/stacktrace/StackTraceLine.java
index c85686c80b5c..7079d61bd650 100644
--- a/java/execution/impl/src/com/intellij/execution/stacktrace/StackTraceLine.java
+++ b/java/execution/impl/src/com/intellij/execution/stacktrace/StackTraceLine.java
@@ -118,9 +118,10 @@ public class StackTraceLine {
     if (project == null) return null;
     final PsiManager psiManager = PsiManager.getInstance(project);
     PsiClass psiClass = JavaPsiFacade.getInstance(psiManager.getProject()).findClass(className, GlobalSearchScope.allScope(project));
-    if (psiClass == null || (psiClass.getNavigationElement() instanceof PsiCompiledElement)) return null;
-    psiClass = (PsiClass)psiClass.getNavigationElement();
-    final PsiFile psiFile = psiClass.getContainingFile();
+    PsiElement navElement = psiClass == null ? null : psiClass.getNavigationElement();
+    if (psiClass == null || navElement instanceof PsiCompiledElement) return null;
+
+    final PsiFile psiFile = navElement.getContainingFile();
     return PsiTreeUtil.getParentOfType(psiFile.findElementAt(offsetOfLine(psiFile, lineNumber)), PsiClass.class, false);
   }
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/fileChooser/actions/RefreshFileChooserAction.java b/platform/platform-impl/src/com/intellij/openapi/fileChooser/actions/RefreshFileChooserAction.java
index d57c2f55a579..1117602ec1e9 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileChooser/actions/RefreshFileChooserAction.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileChooser/actions/RefreshFileChooserAction.java
@@ -15,18 +15,21 @@
  */
 package com.intellij.openapi.fileChooser.actions;
 
-import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.application.ModalityState;
-import com.intellij.openapi.project.DumbAware;
+import com.intellij.openapi.fileChooser.FileSystemTree;
 import com.intellij.openapi.vfs.newvfs.ManagingFS;
 import com.intellij.openapi.vfs.newvfs.RefreshQueue;
 
 /**
  * @author yole
-*/
-public class RefreshFileChooserAction extends AnAction implements DumbAware {
-  public void actionPerformed(final AnActionEvent e) {
+ */
+public class RefreshFileChooserAction extends FileChooserAction {
+  protected void update(FileSystemTree fileChooser, AnActionEvent e) {
+  }
+
+  @Override
+  protected void actionPerformed(FileSystemTree fileChooser, AnActionEvent e) {
     RefreshQueue.getInstance().refresh(true, true, null, ModalityState.current(), ManagingFS.getInstance().getLocalRoots());
   }
 }
\ No newline at end of file