change error message handling.