CLOUDIFY-2180 Fixed NPE when no serviceName defined