diff --git a/python/educational/interactive-learning/src/com/jetbrains/edu/learning/actions/StudyFillPlaceholdersAction.java b/python/educational/interactive-learning/src/com/jetbrains/edu/learning/actions/StudyFillPlaceholdersAction.java
index d8e323c4ff28..9e544a2eefde 100644
--- a/python/educational/interactive-learning/src/com/jetbrains/edu/learning/actions/StudyFillPlaceholdersAction.java
+++ b/python/educational/interactive-learning/src/com/jetbrains/edu/learning/actions/StudyFillPlaceholdersAction.java
@@ -55,9 +55,10 @@ public class StudyFillPlaceholdersAction extends AnAction {
       StudyState studyState = new StudyState(studyEditor);
       if (!studyState.isValid()) {
         e.getPresentation().setEnabledAndVisible(false);
+        return;
       }
       TaskFile taskFile = studyState.getTaskFile();
-      if (taskFile == null || taskFile.getAnswerPlaceholders().isEmpty()) {
+      if (taskFile.getAnswerPlaceholders().isEmpty()) {
         e.getPresentation().setEnabledAndVisible(false);
       }
     }