AMQP-422: NPE fix and `catch` logic