am 2c82a585: am f79d6f69: Fix NPE resulting from invalid instance state

* commit '2c82a58551dabc42238466db29eae5e1ddfdc3de':
  Fix NPE resulting from invalid instance state