am 6ad437ed: Merge "Fix NPE due to the lack of null-check" into lmp-dev

* commit '6ad437edd93382ce872c42fc8a2126e34dbf98d9':
  Fix NPE due to the lack of null-check