Add check for None in conf mode