Add missing file check and retrieve