Added more feedback from gateway in case errors occur