Fix empty results set being null