Fix/error response

i know… topic branches and stuff, it kinda is all one topic