diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index 713d47bca02b5..8ef5c0c9adc8b 100644
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-08  Ivan N. Zlatev  <contact@i-nz.net>
+
+	* ErrorProvider.cs: Unbreak my previous commit.
+
 2008-09-08  Ivan N. Zlatev  <contact@i-nz.net>
 
 	* ErrorProvider.cs: Icon should always be 16x16.
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ErrorProvider.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ErrorProvider.cs
index b24acf4b75175..2d3c2bbd1a097 100644
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ErrorProvider.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ErrorProvider.cs
@@ -412,7 +412,7 @@ public ErrorProvider (IContainer container) : this ()
 			}
 
 			set {
-				if (icon.Height != 16 || icon.Width != 16)
+				if (value != null && (value.Height != 16 || value.Width != 16))
 					icon = new Icon (value, 16, 16);
 				else
 					icon = value;