Add more tolerant error handling on service create