Fixed early returns on exceptions.