am 7785b889: am 95f85c8a: Fix NPE when intent is null

* commit '7785b8894acbb3f25a495edfa498418ff9f4dbed':
  Fix NPE when intent is null