am 901b8c98: am 116f57fe: Catch potential NPE

* commit '901b8c98ecba095d53b8cc811a2c8c00ab0faad7':
  Catch potential NPE