changed; I still get the null issue, so am keeping the check