Added fix for msg nil edge case. fixed comment wording

code review issues, bumped version and changelog entry

Fixed rebase issues

Moved strip out of the function

Fixes for code review comments

Removed trailing whitespaces