diff --git a/library/Zend/Service/Amazon/SimpleDb.php b/library/Zend/Service/Amazon/SimpleDb.php
index 71921f35d7..2d597e9094 100644
--- a/library/Zend/Service/Amazon/SimpleDb.php
+++ b/library/Zend/Service/Amazon/SimpleDb.php
@@ -307,7 +307,6 @@ public function listDomains($maxNumberOfDomains = 100, $nextToken = null)
 
         $nextTokenNode = $response->getSimpleXMLDocument()->ListDomainsResult->NextToken;
         $nextToken     = (string)$nextTokenNode;
-        $nextToken     = (trim($nextToken) === '') ? null : $nextToken;
 
         return new Zend_Service_Amazon_SimpleDb_Page($data, $nextToken);
     }
diff --git a/library/Zend/Service/Amazon/SimpleDb/Page.php b/library/Zend/Service/Amazon/SimpleDb/Page.php
index 0465a1ebad..52be574507 100644
--- a/library/Zend/Service/Amazon/SimpleDb/Page.php
+++ b/library/Zend/Service/Amazon/SimpleDb/Page.php
@@ -50,8 +50,18 @@ class Zend_Service_Amazon_SimpleDb_Page
      */
     public function __construct($data, $token = null)
     {
-        $this->_data  = $data;
-        $this->_token = $token;
+        $this->setData($data);
+        $this->setToken($token);
+    }
+
+    /**
+     * Set page data
+     *
+     * @param string $data
+     */
+    public function setData($data)
+    {
+        $this->_data = $data;
     }
 
     /**
@@ -64,6 +74,16 @@ public function getData()
         return $this->_data;
     }
 
+    /**
+     * Set token
+     *
+     * @param string|null $token
+     */
+    public function setToken($token)
+    {
+        $this->_token = (trim($token) === '') ? null : $token;
+    }
+
     /**
      * Retrieve token
      *