Fix except clauses