Don't exit fatally on connect failure

Also tweaked quitting/exiting channel setup
Merge branch 'master' into uncodin