Added logging to make clear why error_response is  called
Merge remote-tracking branch 'origin/master'