am 962a40fa: am b68e03a8: Fix NPE

* commit '962a40fafb2b5d7fc66c46bdcb1e8d587d355c30':
  Fix NPE