Changed non 200 response logic