Add gurads for invalid request, not yet test implemented (ref gh-94).