diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodArgumentFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodArgumentFix.java
index 06a93cda01ce..6ad881ce07c7 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodArgumentFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodArgumentFix.java
@@ -65,8 +65,9 @@ public abstract class MethodArgumentFix implements IntentionAction {
     PsiExpression expression = myArgList.getExpressions()[myIndex];
 
     try {
+      LOG.assertTrue(expression != null && expression.isValid());
       PsiExpression modified = myArgumentFixerActionFactory.getModifiedArgument(expression, myToType);
-      LOG.assertTrue(modified != null);
+      LOG.assertTrue(modified != null, myArgumentFixerActionFactory);
       expression.replace(modified);
     }
     catch (IncorrectOperationException e) {