tweaks error handling, response