tree 42c7129fdf4e6d7e04dd1f9a5a45d6ce52b50e9d
parent 1228b3bc8e523ad07bcac602d89890690c9f06ef
author Michael Jurka <mikejurka@google.com> 1311382821 -0700
committer Michael Jurka <mikejurka@google.com> 1311450537 -0700

Fix two crashes

- NPE: bug #4984219
- IllegalStateException: bug #4969695

Change-Id: Iaf02e669b26f9277388e0e7bffd532220ebf9bb1