https://bugzilla.redhat.com/show_bug.cgi?id=917045 - fixed exception handling
Merge pull request #1079 from andytaylor/2.3.x

https://bugzilla.redhat.com/show_bug.cgi?id=917045 - fixed exception handling