--- librarian/rarian-info.c	2008-03-30 12:43:17.000000000 -0700
+++ librarian/rarian-info.c	2008-03-30 12:44:22.000000000 -0700
@@ -668,8 +668,10 @@ rrn_info_find_from_uri (char *uri, char 
     l = l->next;
   }
   
-  return best_result->reg;
+  if (best_result)
+     return best_result->reg;
 
+  return NULL;
 }
 
 void