Add check to ensure valid key info is available