CLC-1588 Tweak activity messages
- Added additional string check
- Added test