diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/AbstractCleaningLinker.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/AbstractCleaningLinker.java
index <HASH>..<HASH> 100644
--- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/AbstractCleaningLinker.java
+++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/linking/impl/AbstractCleaningLinker.java
@@ -84,10 +84,12 @@ public abstract class AbstractCleaningLinker extends AbstractLinker {
 	 */
 	protected boolean shouldCheckParentNode(INode node) {
 		if (node.getGrammarElement() instanceof AbstractElement) {
-			AbstractElement grammarElement = (AbstractElement) node.getGrammarElement();
-			Assignment assignment = GrammarUtil.containingAssignment(grammarElement);
-			if (assignment == null && node.getParent() != null && !node.getParent().hasDirectSemanticElement()) {
-				return true;
+			if (node.getParent() != null && !node.getParent().hasDirectSemanticElement()) {
+				AbstractElement grammarElement = (AbstractElement) node.getGrammarElement();
+				Assignment assignment = GrammarUtil.containingAssignment(grammarElement);
+				if (assignment == null) {
+					return true;
+				}
 			}
 		}
 		return false;
[organizeImports] Fix: ValueConverterException on organize imports

This fixes a regression due to the application of value converters
on organize imports

see <URL>