Some null pointer coverage
Some AS automated changes