Better exit handling.
2 files changed