Exceptions fixed client side