Handler fixes
Updates after review
Merge pull request #582 from Metaswitch/iss581

[Reviewer: Alex] Handler fixes