Clean up bad response logic a bit