Added SIGINT catching because the exception text was annoying. On a sidenote, I'm committing from an airplane :D