1fbb5da29a
* commit '29bbd570fe36c55321a3cd9d84330dea9d2f1e10': Add null pointer check.
* commit '29bbd570fe36c55321a3cd9d84330dea9d2f1e10': Add null pointer check.