Oh! I see the issue with that failed test.
What was the reason to change it to generic Exception? 
From other side may be there is need to check the type of `e` and rethrow it as is if it is `MessagingException` ?