Fixed error handling for !.