Attempt urgent fix of u.f.o. crashing on component entities.