Small logic change to test if vars are None