am f60d96d6: Fixed a NPE

* commit 'f60d96d6bf4c3dce367ce48436f383897c7f9719':
  Fixed a NPE