Merge "Handle provider initialization failure"