Added the error message to the json parse error.
Moved expectation handling into the new AbstractValidator