diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 3ea3933fa5..eb283d61e3 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2018-04-17  Nick Clifton  <nickc@redhat.com>
+
+	PR 23065
+	* dwarf2.c (concat_filename): Check for a NULL table pointer.
+
 2018-04-16  Nick Clifton  <nickc@redhat.com>
 
 	PR 23061
diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c
index ca22db766c..0f8257f601 100644
--- a/bfd/dwarf2.c
+++ b/bfd/dwarf2.c
@@ -1566,7 +1566,7 @@ concat_filename (struct line_info_table *table, unsigned int file)
 {
   char *filename;
 
-  if (file - 1 >= table->num_files)
+  if (table == NULL || file - 1 >= table->num_files)
     {
       /* FILE == 0 means unknown.  */
       if (file)