Fix the case where the entry assembly is null