Don't return errors - prefer updating map