am f79d6f69: Fix NPE resulting from invalid instance state

* commit 'f79d6f699b04a735e1627b47a059760ff40c26b9':
  Fix NPE resulting from invalid instance state