From ad96202aab73203e8cefe10d6e78ca7f01b78c51 Mon Sep 17 00:00:00 2001
From: Alexander Lobas <Alexander.Lobas@jetbrains.com>
Date: Thu, 14 Mar 2013 13:20:28 +0400
Subject: [PATCH] IDEA-90621 (last user stacktrace)

---
 .../src/com/intellij/uiDesigner/palette/Palette.java          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/palette/Palette.java b/plugins/ui-designer/src/com/intellij/uiDesigner/palette/Palette.java
index 770e577f3494..8a2eaf255a03 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/palette/Palette.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/palette/Palette.java
@@ -613,7 +613,8 @@ public final class Palette implements ProjectComponent, PersistentStateComponent
       for (final PropertyDescriptor descriptor : descriptors) {
         Method readMethod = descriptor.getReadMethod();
         Method writeMethod = descriptor.getWriteMethod();
-        if (writeMethod == null || readMethod == null) {
+        Class propertyType = descriptor.getPropertyType();
+        if (writeMethod == null || readMethod == null || propertyType == null) {
           continue;
         }
 
@@ -630,7 +631,6 @@ public final class Palette implements ProjectComponent, PersistentStateComponent
 
         final IntrospectedProperty property;
 
-        final Class propertyType = descriptor.getPropertyType();
         final Properties properties = (myProject == null) ? new Properties() : Properties.getInstance();
         if (int.class.equals(propertyType)) { // int
           IntEnumEditor.Pair[] enumPairs = properties.getEnumPairs(aClass, name);