fixed extra nil validation