diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/ResourceTextDescriptor.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/ResourceTextDescriptor.java
index 414de1d459c6..b182c8826f5b 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/ResourceTextDescriptor.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/ResourceTextDescriptor.java
@@ -35,10 +35,14 @@ class ResourceTextDescriptor implements TextDescriptor {
     return Objects.hash(myLoader, myResourcePath);
   }
 
+  @NotNull
   @Override
   public String getText() throws IOException {
     InputStream stream = myLoader.getResourceAsStream(myResourcePath);
-    return stream != null ? ResourceUtil.loadText(stream) : null;
+    if (stream == null) {
+      throw new IOException("Resource not found: " + myResourcePath);
+    }
+    return ResourceUtil.loadText(stream);
   }
 
   @NotNull
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/TextDescriptor.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/TextDescriptor.java
index 61530bcbbe6e..cac1e56ccb5e 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/TextDescriptor.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/TextDescriptor.java
@@ -24,6 +24,7 @@ import java.io.IOException;
  * @author yole
  */
 public interface TextDescriptor {
+  @NotNull
   String getText() throws IOException;
   @NotNull
   String getFileName();
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixTemplateMetaData.java b/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixTemplateMetaData.java
index eb5f5a6d095b..7d9089ac65a8 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixTemplateMetaData.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixTemplateMetaData.java
@@ -67,6 +67,7 @@ public final class PostfixTemplateMetaData extends BeforeAfterActionMetaData {
     List<TextDescriptor> list = new ArrayList<>(before.length);
     for (final TextDescriptor descriptor : before) {
       list.add(new TextDescriptor() {
+        @NotNull
         @Override
         public String getText() throws IOException {
           return StringUtil.replace(descriptor.getText(), KEY, key);