1 files changed, 4 insertions, 2 deletions
diff --git a/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java b/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java
index 9cb57be6ad9d..1a9afd1e25e5 100644
--- a/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java
@@ -670,12 +670,14 @@ public class LanguageConsoleImpl implements Disposable, TypeSafeDataProvider {
     }
   }
 
+  @NotNull
   public Editor getCurrentEditor() {
-    return ObjectUtils.chooseNotNull(myCurrentEditor, myConsoleEditor);
+    return ObjectUtils.notNull(myCurrentEditor, myConsoleEditor);
   }
 
+  @NotNull
   public Language getLanguage() {
-    return myVirtualFile.getLanguage();
+    return ObjectUtils.assertNotNull(myVirtualFile.getLanguage());
   }
 
   public void setLanguage(@NotNull Language language) {