Clean-up after service creation errors

[#82739874]