diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 61edfb73667..374a01f342d 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-27  H.J. Lu  <hjl@gnu.org>
+
+	* aoutx.h (NAME(aout,bfd_free_cached_info)): Return true if
+	abfd->tdata.aout_data == NULL.
+
 2001-02-27  Alan Modra  <alan@linuxcare.com.au>
 
 	* elf32-hppa.c: Correct field selector in stub comments.
diff --git a/bfd/aoutx.h b/bfd/aoutx.h
index 94a46b08689..e5cc394ca14 100644
--- a/bfd/aoutx.h
+++ b/bfd/aoutx.h
@@ -2906,7 +2906,8 @@ NAME(aout,bfd_free_cached_info) (abfd)
 {
   asection *o;
 
-  if (bfd_get_format (abfd) != bfd_object)
+  if (bfd_get_format (abfd) != bfd_object
+      || abfd->tdata.aout_data == NULL)
     return true;
 
 #define BFCI_FREE(x) if (x != NULL) { free (x); x = NULL; }