Updated message checking to avoid stale data from being displayed.
Merge branch 'master' into TOOLS-177