Merge "Fix issue caused by NULL at msg pointer"