1 files changed, 3 insertions, 1 deletions
diff --git a/java/java-impl/src/com/intellij/util/xml/PsiClassConverter.java b/java/java-impl/src/com/intellij/util/xml/PsiClassConverter.java
index d4f579084216..8a2ed8be9d12 100644
--- a/java/java-impl/src/com/intellij/util/xml/PsiClassConverter.java
+++ b/java/java-impl/src/com/intellij/util/xml/PsiClassConverter.java
@@ -33,9 +33,11 @@ import org.jetbrains.annotations.Nullable;
 public class PsiClassConverter extends Converter<PsiClass> implements CustomReferenceConverter<PsiClass> {
 
   public PsiClass fromString(final String s, final ConvertContext context) {
+    if (StringUtil.isEmptyOrSpaces(s)) return null;
+
     final DomElement element = context.getInvocationElement();
     final GlobalSearchScope scope = element instanceof GenericDomValue ? getScope(context) : null;
-    return DomJavaUtil.findClass(s, context.getFile(), context.getModule(), scope);
+    return DomJavaUtil.findClass(s.trim(), context.getFile(), context.getModule(), scope);
   }
 
   @Nullable