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

* commit '7c3fc128913ae22b15478c086c07b36aa7fd51e6':
  Fix NPE resulting from invalid instance state