From e61ac144daaa4af59981102fd5eefba04f20d281 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Fri, 25 Sep 2015 20:57:53 +0300
Subject: [PATCH] EA-73499 - NPE: JavaFxClassBackedElementDescriptor.validate

---
 .../src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java    | 2 +-
 .../fxml/descriptors/JavaFxClassBackedElementDescriptor.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java
index c72b0327c243..861d90eacb95 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java
@@ -473,7 +473,7 @@ public class JavaFxPsiUtil {
     });
   }
 
-  public static String isClassAcceptable(@Nullable XmlTag parentTag, final PsiClass aClass) {
+  public static String isClassAcceptable(@Nullable XmlTag parentTag, @Nullable final PsiClass aClass) {
     if (parentTag == null) {
       return null;
     }
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxClassBackedElementDescriptor.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxClassBackedElementDescriptor.java
index 98c7f067630c..a3e8499d5e62 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxClassBackedElementDescriptor.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxClassBackedElementDescriptor.java
@@ -369,7 +369,7 @@ public class JavaFxClassBackedElementDescriptor implements XmlElementDescriptor,
     }
     PsiClass aClass = myPsiClass;
     final XmlAttribute constAttr = context.getAttribute(FxmlConstants.FX_CONSTANT);
-    if (constAttr != null) {
+    if (constAttr != null && aClass != null) {
       final PsiField constField = aClass.findFieldByName(constAttr.getValue(), false);
       if (constField != null) {
         aClass = PsiUtil.resolveClassInType(constField.getType());