diff --git a/gas/ChangeLog b/gas/ChangeLog
index 116ba375fb7..caef2baa553 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-21  Mike Frysinger  <vapier@gentoo.org>
+
+	* config/tc-mips.c (mips_after_parse_args): Assert that arch_info
+	is non-NULL.
+
 2012-05-19  Alan Modra  <amodra@gmail.com>
 
 	* config/obj-elf.c (obj_elf_section): Cater for TC_KEEP_OPERAND_SPACES
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index d6b8ecb4903..4760c05d4b7 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -15005,7 +15005,10 @@ mips_after_parse_args (void)
     }
 
   if (arch_info == 0)
-    arch_info = mips_parse_cpu ("default CPU", MIPS_CPU_STRING_DEFAULT);
+    {
+      arch_info = mips_parse_cpu ("default CPU", MIPS_CPU_STRING_DEFAULT);
+      gas_assert (arch_info);
+    }
 
   if (ABI_NEEDS_64BIT_REGS (mips_abi) && !ISA_HAS_64BIT_REGS (arch_info->isa))
     as_bad (_("-march=%s is not compatible with the selected ABI"),