More exception fixes