Don't catch such a broad exception.
Use a less sophisticated, but hopefully faster method for sudo.
Merge origin/master