FS-28 replaced an IOException in some places with returns