PLATFORM-390 Better messaging