INFRA-39, Adding Error handling, messaging for production for which tickets will be deployed