exception fixes