Adding some extra checks to the response endpoint.

Can add token checks when #217 is in place.