Expanded error catching
Merge branch 'master' of https://github.com/quandl/Python