Updated some null pointer returns to instead return empty lists.