am 7beccc08: am fa7969fb: Fix NPE

* commit '7beccc08e3a90afd0732a187ba48ea5daaa5f9bb':
  Fix NPE