am 116f57fe: Catch potential NPE

* commit '116f57fe659db05186ce85aa192bd65a974684e9':
  Catch potential NPE