generic_services: fix return value logic