Updating error handling