Added some error handling around PyPi silly-ness