FC-1245 fix errors when files are missing