diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 1a84fc5ea8..6b081f92db 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-11  Maks Naumov  <maksqwe1@ukr.net>
+
+	PR 17141
+	* elf.c (_bfd_elf_strtab_add): Check strtab name for failure.
+
 2014-07-08  Nick Clifton  <nickc@redhat.com>
 
 	PR ld/17110
diff --git a/bfd/elf.c b/bfd/elf.c
index 3f377d1e9d..9dc6b6d121 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -5298,7 +5298,7 @@ prep_headers (bfd *abfd)
   elf_tdata (abfd)->shstrtab_hdr.sh_name =
     (unsigned int) _bfd_elf_strtab_add (shstrtab, ".shstrtab", FALSE);
   if (elf_tdata (abfd)->symtab_hdr.sh_name == (unsigned int) -1
-      || elf_tdata (abfd)->symtab_hdr.sh_name == (unsigned int) -1
+      || elf_tdata (abfd)->strtab_hdr.sh_name == (unsigned int) -1
       || elf_tdata (abfd)->shstrtab_hdr.sh_name == (unsigned int) -1)
     return FALSE;