Fixed the NPE by returning an empty array list instead of null