am eb91462f: am d6dd7c8a: Fix NPE

* commit 'eb91462f087028e2ce22552ba8ce4e17b9a4f9c1':
  Fix NPE