A shameful minor addition of Redundant checks.

I wanted to just move that error handling out of the if statement, but I don't remember what lines 134 through 140 do, so I duplicated everything else outside of the if statement.