This check could be moved to a private method (factor with the check in the update method)