Added client side response checking