Simplify this code: don't check for the same error two

different ways. Check once, and use an assert to handle
consistency checking.

llvm-svn: 117397