Correctly catch an exception

This is causing serious issues for some people in Windows, so we need to push
it into a release.
Merge branch 'master' of github.com:ContinuumIO/conda