A bit simpler
Fix an NPE that occurs when initially loading certain files