am a9e35b6e: Prevent a null pointer exception.

Merge commit 'a9e35b6e3101fafb07e6bb4282e7dfc4dcfdc193' into gingerbread-plus-aosp

* commit 'a9e35b6e3101fafb07e6bb4282e7dfc4dcfdc193':
  Prevent a null pointer exception.