Be more tolerant to missing entries

Fail in a friendlier way