Now handles null valids within array