Merge pull request #1912 from ethomson/push_err_messages Test for failure, but don't test the error message