am fa7969fb: Fix NPE

* commit 'fa7969fbd587d8eb2e43093a83fcad85e2b91726':
  Fix NPE