Fixed false-testing to handle new error handling messages