diff --git a/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/preferences/editors/TypeText.java b/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/preferences/editors/TypeText.java
index 01abb20e35..85b20c1b09 100644
--- a/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/preferences/editors/TypeText.java
+++ b/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/preferences/editors/TypeText.java
@@ -3,7 +3,6 @@ package net.sourceforge.pmd.eclipse.ui.preferences.editors;
 import net.sourceforge.pmd.util.ClassUtil;
 import net.sourceforge.pmd.util.StringUtil;
 
-import org.eclipse.jdt.core.JavaConventions;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
@@ -129,8 +128,9 @@ public class TypeText extends Composite {
             return cls;
         }
 
-        // FIXME - incorporate this
-//        JavaConventions.validateClassFileName(typeStr, sourceLevel, complianceLevel);
+        // FIXME - incorporate this      
+//        IJavaProject project = getJavaProject();
+//        IStatus status = JavaConventions.validateClassFileName(typeStr, project.getOption(JavaCore.COMPILER_SOURCE, true), project.getOption(JavaCore.COMPILER_COMPLIANCE, true));
         
         try {
             return Class.forName(typeStr);
diff --git a/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/util/UniqueItemsAsShapeBuilder.java b/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/util/UniqueItemsAsShapeBuilder.java
index 4c9f47ee42..1940fb9d7d 100644
--- a/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/util/UniqueItemsAsShapeBuilder.java
+++ b/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/util/UniqueItemsAsShapeBuilder.java
@@ -95,6 +95,7 @@ public class UniqueItemsAsShapeBuilder extends AbstractCellPainterBuilder {
                 if (event.index != columnIndex) return;
                 
                 Object item = ((TreeItem)event.item).getData();
+                if (item == null) return;
                 Set<Comparable<?>> items = RuleUtil.uniqueItemsIn(item, getter);
                 
                 event.width = width + (items.size() * width);