Merge pull request #283 from alphagov/improve-error-messages-4

Improve error message for JSON parsing errors
Test for null-body error message

https://www.pivotaltracker.com/story/show/69912016
Improve error message for empty JSON payload

https://www.pivotaltracker.com/story/show/69912016

[Delivers #69912016]