Be a bit more verbose in the endpoint handling code