Minor exception fixes