am 380929d0: Prevent NPE

* commit '380929d02b329cafe8330903a01b862aafdd044d':
  Prevent NPE