Show null entity fix