diff --git a/ChangeLog b/ChangeLog
index 0aee393..cc2a008 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-16  Mike Newman  <mike@gtnorthern.demon.co.uk>
+
+	* src/tree.c: fix a segfault if a --list is constructed and there
+	is no data to put in it. Since a list with no contents to select
+	seemed pointless, return without showing dialog.
+
 2003-01-15  Glynn Foster  <glynn.foster@sun.com>
 
 	* help/C/Makefile.am, help/C/legal.xml, help/C/zenity-C.omf, 
diff --git a/src/tree.c b/src/tree.c
index 29b38c6..c19b180 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -124,7 +124,13 @@ zenity_tree (ZenityData *data, ZenityTreeData *tree_data)
 	        data->exit_code = -1;
                 return;
         }
-	
+
+	if (tree_data->data == NULL) {
+		g_printerr (_("No contents specified for --list\n"));
+		data->exit_code = -1;
+		return;
+	}
+
 	glade_xml_signal_autoconnect (glade_dialog);
 
 	dialog = glade_xml_get_widget (glade_dialog, "zenity_tree_dialog");