Fix leftover IO and missing rescue