Bugfix on context, and correct error response