Check for None a couple places