Fixed callback error handling.