Merge "Bugfix: adds extra null check" into lmp-dev