Return an empty collection instead of null

Return an empty collection instead of null #4977