further exception fixes