Give up on 4xx or non-503 response
Code review mark-ups
Merge pull request #142 from Metaswitch/issue624

[Reviewer: Andy] Give up on 4xx or non-503 response