1.3.5 uses try/except incorrectly in two places

[stromberg]

I believe 1.3.5 uses try/except in a way that fails to catch one of the two listed exceptions, instead overwriting the second exception listed with detail related to the first. I believe this source of bugs is why try/except's syntax was changed slightly in Python 3.x.

The syntax is fine, but I doubt it's doing what's intended.

I've attached a diff that fixes the two bad try/except's by simply adding parentheses to form a tuple of exceptions.

[Calum]

Fixed ​42118932