Clean up some logic in jail error messages, replacing a missing test and
a redundant test with a single correct test.