Added Client validation and server exception wrapping