diff --git a/ChangeLog b/ChangeLog
index c9a2cf65..724b67fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Mar 25 21:25:31 2005  Søren Sandmann  <sandmann@redhat.com>
+
+	* sysprof.c (get_current_object): Return NULL if nothing is
+	selected.
+
 Fri Mar 25 20:54:08 2005  Søren Sandmann  <sandmann@redhat.com>
 
 	* TODO: More updates
diff --git a/TODO b/TODO
index feb49405..331304c9 100644
--- a/TODO
+++ b/TODO
@@ -35,9 +35,6 @@
 
 - hook up menu items view/start etc (or possibly get rid of them or move them)
 
-- crashes when you ctrl-click the selected item in the top left pane
-   <ian__> ssp: looks like it doesn't handle the none-selected case
-
 - Move "samples" label to the toolbar, then get rid of statusbar.
 
 - consider caching [filename => bin_file]
@@ -73,6 +70,9 @@
 
 DONE:
 
+- crashes when you ctrl-click the selected item in the top left pane
+   <ian__> ssp: looks like it doesn't handle the none-selected case
+
 - loading and saving
 
 - consider making ProfileObject more of an object.
diff --git a/sysprof.c b/sysprof.c
index 4447f667..bdbd583c 100644
--- a/sysprof.c
+++ b/sysprof.c
@@ -675,13 +675,17 @@ get_current_object (Application *app)
     
     selection = gtk_tree_view_get_selection (app->object_view);
     
-    gtk_tree_selection_get_selected (selection, &model, &selected);
-    
-    gtk_tree_model_get (model, &selected,
-			OBJECT_OBJECT, &object,
-			-1);
-    
-    return object;
+    if (gtk_tree_selection_get_selected (selection, &model, &selected))
+    {
+	gtk_tree_model_get (model, &selected,
+			    OBJECT_OBJECT, &object,
+			    -1);
+	return object;
+    }
+    else
+    {
+	return NULL;
+    }
 }
 
 static void