Issue #352 - Narrow Exception scope to IOException