From d11d3a17e461f0270a7655edab2139dc26c8b6ad Mon Sep 17 00:00:00 2001
From: Mike Weis <miweis@magento.com>
Date: Wed, 3 Aug 2016 16:35:06 -0500
Subject: [PATCH] MAGETWO-55229: Problem while upgrading to 2.1.0

 - fixed
---
 app/code/Magento/Cms/Setup/UpgradeData.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Cms/Setup/UpgradeData.php b/app/code/Magento/Cms/Setup/UpgradeData.php
index 9a7dce65b121f..41a28989439af 100644
--- a/app/code/Magento/Cms/Setup/UpgradeData.php
+++ b/app/code/Magento/Cms/Setup/UpgradeData.php
@@ -235,8 +235,11 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
 </div>
 EOD;
             $privacyAndCookiePolicyPage = $this->createPage()->load(self::PRIVACY_COOKIE_PAGE_ID);
-            $privacyAndCookiePolicyPage->setContent($newPageContent);
-            $privacyAndCookiePolicyPage->save();
+            $privacyAndCookiePolicyPageId = $privacyAndCookiePolicyPage->getId();
+            if ($privacyAndCookiePolicyPageId) {
+                $privacyAndCookiePolicyPage->setContent($newPageContent);
+                $privacyAndCookiePolicyPage->save();
+            }
         }
         $setup->endSetup();
     }