Updated CMStore with warning catches.