am cc14c8c4: Prevent a null pointer exception.

Merge commit 'cc14c8c4da26ff93a96078c7c9108682c23bd1af' into gingerbread-plus-aosp

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