diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 52f916e57..a3219cc51 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,5 +1,7 @@
 2005-07-15  Martin Hawlisch  <Martin.Hawlisch@gmx.de>
 	* src/plugins/NavWebPage.py: Avoid some segfaults
+	* src/Utils.py (find_mime_type_pixbuf): Dont segfault with note only object
+	* src/SelectObject.py (on_select_row): Dont segfault with note only object
 
 2005-07-14  Don Allingham  <don@gramps-project.org>
 	* src/plugins/NavWebPage.py: gallery/media object enhancements, div/span fixes
diff --git a/gramps2/src/SelectObject.py b/gramps2/src/SelectObject.py
index a4c4a54c1..10df0cd70 100644
--- a/gramps2/src/SelectObject.py
+++ b/gramps2/src/SelectObject.py
@@ -123,7 +123,10 @@ class SelectObject:
         self.preview.set_from_pixbuf(image)
         
         self.object_handle.set_text(obj.get_gramps_id())
-        self.object_type.set_text(the_type)
+        if the_type:
+            self.object_type.set_text(the_type)
+        else:
+            self.object_type.set_text("")
         self.object_desc.set_text(obj.get_description())
         if len(path) == 0:
             self.object_path.set_text(_("The file no longer exists"))
diff --git a/gramps2/src/Utils.py b/gramps2/src/Utils.py
index ea0c3f8e1..d5075aaf9 100644
--- a/gramps2/src/Utils.py
+++ b/gramps2/src/Utils.py
@@ -232,8 +232,8 @@ def view_photo(photo):
 _icon_theme = gtk.icon_theme_get_default()
 
 def find_mime_type_pixbuf(mime_type):
-    icontmp = mime_type.replace('/','-')
     try:
+        icontmp = mime_type.replace('/','-')
         newicon = "gnome-mime-%s" % icontmp
         try:
             return _icon_theme.load_icon(newicon,48,0)