WS-286: Error response not propagated properly