diff --git a/ChangeLog b/ChangeLog
index 7a06b8f49..f395fff63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-03  Hans Petter Jansson  <hpj@novell.com>
+
+	* src/nautilus-image-properties-page.c (append_exifdata_string):
+	If we get a NULL exifdata, don't try to dereference it. Fixes
+	BGO #530851.
+
 2008-05-03  Christian Neumair  <cneumair@gnome.org>
 
 	* src/nautilus-file-management-properties.glade:
diff --git a/src/nautilus-image-properties-page.c b/src/nautilus-image-properties-page.c
index b6152d326..8702d0b70 100644
--- a/src/nautilus-image-properties-page.c
+++ b/src/nautilus-image-properties-page.c
@@ -228,7 +228,7 @@ append_tag_value_pair (GString  *string,
 static void
 append_exifdata_string (ExifData *exifdata, GString *string)
 {
-	if (exifdata->ifd[0] && exifdata->ifd[0]->count) {
+	if (exifdata && exifdata->ifd[0] && exifdata->ifd[0]->count) {
                 append_tag_value_pair (string, exifdata, EXIF_TAG_MAKE, _("Camera Brand"));
                 append_tag_value_pair (string, exifdata, EXIF_TAG_MODEL, _("Camera Model"));