am 27f80673: am ea496644: Merge "Add null check" into lmp-dev

* commit '27f80673a0bc8997a8f878d2a062defd0f43379e':
  Add null check