Fix null thrownentities