Add the context aware error messages