Adds a bit more guarding and fixes a bug
Adds a bit more guarding and fixes a bug

csaunders/themekit,Shopify/themekit,Shopify/themekit,csaunders/themekit,Shopify/themekit,csaunders/themekit,Shopify/themekit