Some logging and a more consistent response