AbstractService: Add null check on filter