diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 928b44a5c..3a9ad56e8 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,4 +1,6 @@
 2006-07-01  Don Allingham  <don@gramps-project.org>
+	* src/DisplayTabs/_SourceEmbedList.py: check for empty reference
+	before attempting to edit
 	* src/GrampsWidgets.py: fix LinkLabel to not try to rebuild 
 	gender code
 
diff --git a/gramps2/src/DisplayTabs/_SourceEmbedList.py b/gramps2/src/DisplayTabs/_SourceEmbedList.py
index 9c12fa44e..8743d24c4 100644
--- a/gramps2/src/DisplayTabs/_SourceEmbedList.py
+++ b/gramps2/src/DisplayTabs/_SourceEmbedList.py
@@ -124,8 +124,8 @@ class SourceEmbedList(EmbeddedList):
 
     def edit_button_clicked(self, obj):
         sref = self.get_selected()
-        src = self.dbstate.db.get_source_from_handle(sref.ref)
         if sref:
+            src = self.dbstate.db.get_source_from_handle(sref.ref)
             try:
                 from Editors import EditSourceRef