--- DesignerHosting-orig/Toolbox/Toolbox.cs	2008-06-28 17:53:32.000000000 +0100
+++ DesignerHosting/Toolbox/Toolbox.cs	2008-06-28 17:40:36.000000000 +0100
@@ -211,6 +211,8 @@
 				}
 
 				System.Drawing.Design.ToolboxItem tbi = lbSender.Items[e.Index] as System.Drawing.Design.ToolboxItem;
+				if (tbi.Bitmap == null)
+					tbi.Bitmap = new Bitmap (16, 16);
 				Rectangle BitmapBounds = new Rectangle(e.Bounds.Location.X, e.Bounds.Location.Y + e.Bounds.Height / 2 - tbi.Bitmap.Height / 2, tbi.Bitmap.Width, tbi.Bitmap.Height);
 				Rectangle StringBounds = new Rectangle(e.Bounds.Location.X + BitmapBounds.Width + 5, e.Bounds.Location.Y, e.Bounds.Width - BitmapBounds.Width, e.Bounds.Height);