Feature/npe when service not on cluster