diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddVariableInitializerFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddVariableInitializerFix.java
index 29690467d913..9fdbd9975d26 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddVariableInitializerFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddVariableInitializerFix.java
@@ -28,6 +28,7 @@ import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.PsiTypesUtil;
 import com.intellij.psi.util.PsiUtil;
 import com.intellij.util.IncorrectOperationException;
+import com.intellij.util.ObjectUtils;
 import com.intellij.util.SmartList;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
@@ -94,7 +95,7 @@ public class AddVariableInitializerFix implements IntentionAction {
                                            @Nullable Editor editor) {
     if (editor == null) return;
     LOG.assertTrue(!initializers.isEmpty());
-    final PsiExpression initializer = ContainerUtil.getFirstItem(initializers);
+    final PsiExpression initializer = ObjectUtils.notNull(ContainerUtil.getFirstItem(initializers));
     PsiElement context = initializers.size() == 1 ? initializer : PsiTreeUtil.findCommonParent(initializers);
     PsiDocumentManager.getInstance(initializer.getProject()).doPostponedOperationsAndUnblockDocument(editor.getDocument());
     final TemplateBuilderImpl builder = (TemplateBuilderImpl)TemplateBuilderFactory.getInstance().createTemplateBuilder(context);
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InitializeFinalFieldInConstructorFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InitializeFinalFieldInConstructorFix.java
index 76d7d473d7f4..f99520fcac2f 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InitializeFinalFieldInConstructorFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InitializeFinalFieldInConstructorFix.java
@@ -100,7 +100,10 @@ public class InitializeFinalFieldInConstructorFix implements IntentionAction {
     final LookupElement[] suggestedInitializers = AddVariableInitializerFix.suggestInitializer(field);
 
     for (PsiMethod constructor : constructors) {
-      rExpressions.add(addFieldInitialization(constructor, suggestedInitializers, field, project));
+      PsiExpression initialization = addFieldInitialization(constructor, suggestedInitializers, field, project);
+      if (initialization != null) {
+        rExpressions.add(initialization);
+      }
     }
     AddVariableInitializerFix.runAssignmentTemplate(rExpressions, suggestedInitializers, editor);
   }