diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 253013c5a0..7e8c18b280 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,7 @@
 2012-01-01  Doug Evans  <dje@google.com>
 
+	* dwarf2read.c (load_cu): Move assert to more useful location.
+
 	* dwarf2read.c (free_heap_comp_unit): Renamed from free_one_comp_unit.
 	All callers updated.
 
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index b0c4dd0fcd..359d8ac724 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -1833,9 +1833,9 @@ load_cu (struct dwarf2_per_cu_data *per_cu)
   else
     load_full_comp_unit (per_cu, per_cu->objfile);
 
-  dwarf2_find_base_address (per_cu->cu->dies, per_cu->cu);
-
   gdb_assert (per_cu->cu != NULL);
+
+  dwarf2_find_base_address (per_cu->cu->dies, per_cu->cu);
 }
 
 /* Read in the symbols for PER_CU.  OBJFILE is the objfile from which