More files converted towards exceptions