* WS errors better handling