am ffc2682a: Fix NPE

* commit 'ffc2682a9784e03d7cc9943f4f408255f8468b96':
  Fix NPE