Fix some obviously wrong except clauses