Null pointer - version 2

version 2 of null pointer processing.