--- evince-2.30.1/shell/ev-metadata.c	2010-04-05 11:21:59.000000000 +0200
+++ evince-2.30.1/shell/ev-metadata.c	2010-06-22 14:09:16.000000000 +0200
@@ -145,6 +145,9 @@ ev_metadata_get_string (EvMetadata  *met
 {
 	gchar *v;
 
+	if (!metadata)
+		return FALSE;
+
 	v = g_hash_table_lookup (metadata->items, key);
 	if (!v)
 		return FALSE;
@@ -174,6 +177,9 @@ ev_metadata_set_string (EvMetadata  *met
 	GFileInfo *info;
 	gchar     *gio_key;
 
+	if (!metadata)
+		return FALSE;
+
 	info = g_file_info_new ();
 
 	gio_key = g_strconcat (EV_METADATA_NAMESPACE"::", key, NULL);