Added check on ENOENT