Mainly exception fixes