Fix null pointer exception am: 14810c7
am: 00217cd

* commit '00217cddcd1d3a0681214fe9d629f61dbfb5d9e6':
  Fix null pointer exception