diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyTrivialConditionalInspection.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyTrivialConditionalInspection.java
index bb27ca678798..d1434e6bbf43 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyTrivialConditionalInspection.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyTrivialConditionalInspection.java
@@ -25,6 +25,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.plugins.groovy.codeInspection.BaseInspection;
 import org.jetbrains.plugins.groovy.codeInspection.BaseInspectionVisitor;
 import org.jetbrains.plugins.groovy.codeInspection.GroovyFix;
+import org.jetbrains.plugins.groovy.intentions.base.ErrorUtil;
 import org.jetbrains.plugins.groovy.intentions.utils.BoolUtils;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrConditionalExpression;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpression;
@@ -96,6 +97,8 @@ public class GroovyTrivialConditionalInspection extends BaseInspection {
         return;
       }
 
+      if (ErrorUtil.containsError(exp)) return;
+
       final GrExpression thenExpression = exp.getThenBranch();
       if (thenExpression == null) {
         return;