Minor fixes to IOException catches