diff --git a/gnome/ChangeLog b/gnome/ChangeLog
index a5847de9d..8b54b13df 100644
--- a/gnome/ChangeLog
+++ b/gnome/ChangeLog
@@ -1,3 +1,8 @@
+2000-02-03  Pavel Machek  <pavel@artax.karlin.mff.cuni.cz>
+
+	* gicon.c (gicon_init): make missing icons back fatal (prevents
+	segfault)
+
 2000-02-01  Pavel Machek  <pavel@artax.karlin.mff.cuni.cz>
 
 	* gicon.c (gicon_init): make missing icons non-fatal error
diff --git a/gnome/gicon.c b/gnome/gicon.c
index db02b8c42..dd228c80f 100644
--- a/gnome/gicon.c
+++ b/gnome/gicon.c
@@ -1,6 +1,6 @@
 /* Icon loading support for the Midnight Commander
  *
- * Copyright (C) 1998-1999 The Free Software Foundation
+ * Copyright (C) 1998-2000 The Free Software Foundation
  *
  * Authors: Miguel de Icaza <miguel@nuclecu.unam.mx>
  *          Federico Mena <federico@nuclecu.unam.mx>
@@ -278,8 +278,10 @@ gicon_init (void)
 
 	if (!iset_directory || !iset_dirclosed || !iset_executable ||
 	    !iset_regular || !iset_core || !iset_fifo || !iset_chardev ||
-	    !iset_blockdev || !symlink_overlay || !stalled_overlay)
-		message (1, _("Warning"), _("Default set of icons not found, check your installation"));
+	    !iset_blockdev || !symlink_overlay || !stalled_overlay) {
+		message (1, _("Error"), _("Default set of icons not found, check your installation"));
+		exit(1);
+	}
 
 	our_uid = getuid ();
 	our_gid = getgid ();