Add the context aware error messages

Add the context aware error messages.


Please review and merge