diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 344765f66..2d91dd16f 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -2,6 +2,8 @@
 	* src/plugins/NavWebPage.py: Correct link to Surname list page;
 	Better handling for not existing media object files and note-only
 	objects; thumbnails are always png images
+	* src/plugins/Check.py: Files of note-only objects are no longer
+	reported as missing
 
 2005-08-28  Don Allingham  <don@gramps-project.org>
 	* src/plugins/NavWebPage.py: handle resticted living people
diff --git a/gramps2/src/plugins/Check.py b/gramps2/src/plugins/Check.py
index 072ce949f..c3ec5c5d8 100644
--- a/gramps2/src/plugins/Check.py
+++ b/gramps2/src/plugins/Check.py
@@ -314,7 +314,7 @@ class CheckIntegrity:
         for ObjectId in self.db.get_media_object_handles():
             obj = self.db.get_object_from_handle(ObjectId)
             photo_name = obj.get_path()
-            if not os.path.isfile(photo_name):
+            if photo_name is not None and photo_name != "" and not os.path.isfile(photo_name):
                 if cl:
                     print "Warning: media file %s was not found." \
                         % os.path.basename(photo_name)