Merge "Fix error reporting for PUT/POST"