am 9386b388: Merge "Fix NPE"

* commit '9386b388f6ea29a6aa7558eee13ebfeeab8ae2cb':
  Fix NPE