Merge "Handle the case when KeyChain binding fails"