add ws exception support