I think we may want to do this for all exceptions -- not just KeyboardInterrupt