Merge pull request #535 from jbonofre/AMQ-7480

[AMQ-7480] Avoid NPE if original exception is null