Some exception handling fixes/cleanup for nifty client channels