diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index a85352579fd..ee3a2d09d93 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-17  Nick Clifton  <nickc@redhat.com>
+
+	* elfxx-mips.c (_bfd_mips_elf_check_relocs): Handle the situation
+	where the sym_hashes are not available.
+
 2008-08-17  Alan Modra  <amodra@bigpond.net.au>
 
 	* bfd.c (struct _bfd): Correct outsymbols comment.
diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
index 80ce5b23aad..eb6d55e0425 100644
--- a/bfd/elfxx-mips.c
+++ b/bfd/elfxx-mips.c
@@ -7433,8 +7433,9 @@ _bfd_mips_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
       else
 	{
 	  h = sym_hashes[r_symndx - extsymoff];
-	  while (h->root.type == bfd_link_hash_indirect
-		 || h->root.type == bfd_link_hash_warning)
+	  while (h != NULL
+		 && (h->root.type == bfd_link_hash_indirect
+		     || h->root.type == bfd_link_hash_warning))
 	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
 	}