Minor exception handling change