Fixed passing around nil values from entities.