Cleanup try/excepts to all wrap Exception (fixes ctrl+c issues)