am 880f1e8e: am 4e077af2: Fix NPE when activity is null

* commit '880f1e8eeb2baf0c1105c2c168fe62499e0bfc7f':
  Fix NPE when activity is null