Correct handling of exceptional events
Merge pull request #2 from Metaswitch/bug128

[Reviewer: Mike] Correct handling of exceptional events