This is not part of this issue but found it when looking at the Exception types. [MAILPOET-4259]
[MAILPOET-3988]