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

* commit '318388767d7f6d651f05f4ab9022233c0543b259':
  Fix NPE due to the lack of null-check