Merge "msm: cpp: Fix potential dereference of NULL pointer"