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

* commit '9baaa4b5c7bb9688a9a97e99bdeda9574a890fca':
  Fix NPE due to the lack of null-check