For #6 fixed a bug when an expanded entry was null