Some more defensive coding against crazy MARC