Fixed client side error throrwing