am c8e8a12b: Merge "Fix issue #3289835: NullPointerException in..." into gingerbread

* commit 'c8e8a12b3c649bbaf610d2ff17bb10a7b32fe579':
  Fix issue #3289835: NullPointerException in...