better errorhandling in mq scenario part