PAHMA-979: more bulletproofing: filenames, objectnumbers