o.c.utility.file NPE when closing non-IFileUtil file after restart; resolves #592