diff --git a/ChangeLog b/ChangeLog
index ac141b8422..b129b320b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-13  Marcus Shawcroft  <marcus.shawcroft@linaro.org>
+
+	* elf/tlsdeschtab.h (_dl_make_tlsdesc_dynamic): Handle failure
+	of htab_find_slot().
+
 2013-11-11  David S. Miller  <davem@davemloft.net>
 
 	[BZ #16150]
diff --git a/elf/tlsdeschtab.h b/elf/tlsdeschtab.h
index 155f4fdd9b..8ce8249b92 100644
--- a/elf/tlsdeschtab.h
+++ b/elf/tlsdeschtab.h
@@ -102,6 +102,12 @@ _dl_make_tlsdesc_dynamic (struct link_map *map, size_t ti_offset)
   test.tlsinfo.ti_module = map->l_tls_modid;
   test.tlsinfo.ti_offset = ti_offset;
   entry = htab_find_slot (ht, &test, 1, hash_tlsdesc, eq_tlsdesc);
+  if (! entry)
+    {
+      __rtld_lock_unlock_recursive (GL(dl_load_lock));
+      return 0;
+    }
+
   if (*entry)
     {
       td = *entry;