Merge "Add null check" into lmp-dev