diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7dba67cffd..d462a310cd 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-02  Michael Snyder  <msnyder@access-company.com>
+
+	* gdbtypes.c (check_typedef): Guard NULL.
+
 2007-08-01  Michael Snyder  <msnyder@access-company.com>
 
 	* cli/cli-decode.c (lookup_cmd): Check for null earlier, to 
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index c45dfd44e6..994178d517 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -1318,6 +1318,8 @@ check_typedef (struct type *type)
   struct type *orig_type = type;
   int is_const, is_volatile;
 
+  gdb_assert (type);
+
   while (TYPE_CODE (type) == TYPE_CODE_TYPEDEF)
     {
       if (!TYPE_TARGET_TYPE (type))