diff --git a/src/AddIns/DisplayBindings/ResourceEditor/Project/Src/ResourceEdit/ResourceItem.cs b/src/AddIns/DisplayBindings/ResourceEditor/Project/Src/ResourceEdit/ResourceItem.cs
index 83742d878c..1ce163bd9f 100644
--- a/src/AddIns/DisplayBindings/ResourceEditor/Project/Src/ResourceEdit/ResourceItem.cs
+++ b/src/AddIns/DisplayBindings/ResourceEditor/Project/Src/ResourceEdit/ResourceItem.cs
@@ -46,6 +46,9 @@ namespace ResourceEditor
 		public int ImageIndex
 		{
 			get {
+				if (this.resourceValue == null) {
+					return -1;
+				}
 				switch(this.resourceValue.GetType().ToString()) {
 					case "System.String":
 						return 0;
@@ -65,6 +68,10 @@ namespace ResourceEditor
 		
 		public override string ToString()
 		{
+			if (ResourceValue == null) {
+				return "(Nothing/null)";
+			}
+			
 			string type = ResourceValue.GetType().FullName;
 			string tmp = String.Empty;
 			
diff --git a/src/AddIns/DisplayBindings/ResourceEditor/Project/Src/ResourceEdit/ResourceList.cs b/src/AddIns/DisplayBindings/ResourceEditor/Project/Src/ResourceEdit/ResourceList.cs
index 155eba834b..526df584ad 100644
--- a/src/AddIns/DisplayBindings/ResourceEditor/Project/Src/ResourceEdit/ResourceList.cs
+++ b/src/AddIns/DisplayBindings/ResourceEditor/Project/Src/ResourceEdit/ResourceList.cs
@@ -219,7 +219,7 @@ namespace ResourceEditor
 				ResourceItem item = entry.Value;
 				
 				string tmp  = item.ToString();
-				string type = item.ResourceValue.GetType().FullName;
+				string type = item.ResourceValue == null ? "(Nothing/null)" : item.ResourceValue.GetType().FullName;
 				
 				ListViewItem lv = new ListViewItem(new String[] {item.Name, type, tmp}, item.ImageIndex);
 				Items.Add(lv);