Fixed 4 NPE's, need to fix entity listing