From 7a4aab897ab54403f7bdbd0cab0b1615177e41ab Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Thu, 2 Oct 2014 17:52:39 +0200
Subject: [PATCH] EA-61112 - IAE: CachedValuesManager.getCachedValue

---
 .../src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 ea482b0d0ce7..9e3356a3ad46 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java
@@ -405,7 +405,10 @@ public class JavaFxPsiUtil {
     return null;
   }
 
-  public static String getDefaultPropertyName(PsiClass aClass) {
+  public static String getDefaultPropertyName(@Nullable PsiClass aClass) {
+    if (aClass == null) {
+      return null;
+    }
     final PsiAnnotation annotation = AnnotationUtil.findAnnotationInHierarchy(aClass,
                                                                               Collections.singleton(JavaFxCommonClassNames.JAVAFX_BEANS_DEFAULT_PROPERTY));
     if (annotation != null) {