some exception fixes