am 16ea2877: am bb928ef3: am fa912941: Workaround NPE on Android 2.1

* commit '16ea2877f2bcc29fae467d9d7a433772752310b5':