#457: reverted changes for #414, added additional check that file is missing