Fix NPEs during load in new forge