am fa912941: Workaround NPE on Android 2.1

* commit 'fa91294114db5cfa43910d4d921fd06449192420':
  Workaround NPE on Android 2.1