Improve alerting message

Change-Id: If2c7cc32923427c2e1734d9b8bdd03f9fdb628e9