[*] WS: improve errors handling