fix tobago null service leading to cosmo crash#99

loulecrivain merged 2 commits intomainwobcom/cosmo:mainfrom

fix/tobago-null-servicewobcom/cosmo:fix/tobago-null-serviceCopy head branch name to clipboard