Better error handling behavior.