Null or NotNull functionality fixed.