Error if checks.

These changes were made a while ago so I don't remember how to repro them.