diff --git a/platform/platform-impl/src/com/intellij/ide/actions/RecentLocationManager.java b/platform/platform-impl/src/com/intellij/ide/actions/RecentLocationManager.java index 8c1751d930cf..35f2d0dca1a5 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/RecentLocationManager.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/RecentLocationManager.java @@ -154,8 +154,13 @@ public class RecentLocationManager implements ProjectComponent { @Nullable private static Editor findEditor(@NotNull Project project, @NotNull PlaceInfo changePlace) { - JComponent component = FileEditorManagerEx.getInstanceEx(project).getPreferredFocusedComponent(); - if (component == null || !component.isShowing() || !(component instanceof EditorComponentImpl)) { + try { + JComponent component = FileEditorManagerEx.getInstanceEx(project).getPreferredFocusedComponent(); + if (component == null || !component.isShowing() || !(component instanceof EditorComponentImpl)) { + return null; + } + } + catch (Exception e) { return null; }