Better handling of status update error handling