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

* commit 'ea4966442cd035e592aa73c0c29225efe3f091fb':
  Add null check