diff --git a/lib/graphql/static_validation/rules/fields_will_merge.rb b/lib/graphql/static_validation/rules/fields_will_merge.rb index d4aaff5ba1..05b62f54c2 100644 --- a/lib/graphql/static_validation/rules/fields_will_merge.rb +++ b/lib/graphql/static_validation/rules/fields_will_merge.rb @@ -212,6 +212,7 @@ def find_conflicts_within(response_keys) def find_conflict(response_key, field1, field2, mutually_exclusive: false) return if @conflict_count >= context.max_errors + return if field1.definition.nil? || field2.definition.nil? node1 = field1.node node2 = field2.node