Fix null pointer exception
am: 14810c7

* commit '14810c7e3e5c8153183e36a819779cff4a979c89':
  Fix null pointer exception