Improve handling of PyPi errors
Merge branch 'develop' into hhu