More robust ActiveMQ handling