cleaned up some throws on server and added some debug prints