d23865708c
* commit '2561ee8453dc41a9d65f7890ea227416d7e8948c': Add null pointer checks to fix NPEs
* commit '2561ee8453dc41a9d65f7890ea227416d7e8948c': Add null pointer checks to fix NPEs