Fix NPE with failed query

Return a empty list, not NULL

Change-Id: I9f923919921c3997006d283dd7028dcbd8f06a1c