Fixed some dead error checking.

Flow cleanup.
No logic changes.