bug fixes in client, throwing exceptions now