Correctly return 404
Merge pull request #129 from Metaswitch/iss128

[Reviewer: Alex] Correctly return 404