am be622845: NPE fix

* commit 'be622845acb8492b19fad5036e64f6247ab7a89a':
  NPE fix