Merge "msm: Add null pointer checks"