Merge "Fix warning message when service creation fails"