diff -r 5e7a0fedabdf -r 877f952ae2bd web/lib/Zend/Service/WindowsAzure/Storage/Batch.php
--- a/web/lib/Zend/Service/WindowsAzure/Storage/Batch.php	Thu Mar 21 17:31:31 2013 +0100
+++ b/web/lib/Zend/Service/WindowsAzure/Storage/Batch.php	Thu Mar 21 19:50:53 2013 +0100
@@ -15,26 +15,17 @@
  * @category   Zend
  * @package    Zend_Service_WindowsAzure
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Batch.php 23167 2010-10-19 17:53:31Z mabe $
+ * @version    $Id: Batch.php 24593 2012-01-05 20:35:02Z matthew $
  */
 
-/**
- * @see Zend_Service_WindowsAzure_Exception
- */
-require_once 'Zend/Service/WindowsAzure/Exception.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Storage_BatchStorageAbstract
- */
-require_once 'Zend/Service/WindowsAzure/Storage/BatchStorageAbstract.php';
 
 /**
  * @category   Zend
  * @package    Zend_Service_WindowsAzure
  * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Zend_Service_WindowsAzure_Storage_Batch
@@ -138,6 +129,7 @@
 	    // Set _isSingleSelect
 	    if ($httpVerb == Zend_Http_Client::GET) {
 	        if (count($this->_operations) > 0) {
+                    require_once 'Zend/Service/WindowsAzure/Exception.php';
 	            throw new Zend_Service_WindowsAzure_Exception("Select operations can only be performed in an empty batch transaction.");
 	        }
 	        $this->_isSingleSelect = true;
@@ -149,7 +141,7 @@
 		}
 			
 		// Clean headers
-		if ($headers === null) {
+		if (is_null($headers)) {
 		    $headers = array();
 		}
 		    
@@ -161,7 +153,7 @@
 		$requestUrl     = $this->getBaseUrl() . $path . $queryString;
 		
 		// Generate $rawData
-		if ($rawData === null) {
+		if (is_null($rawData)) {
 		    $rawData = '';
 		}
 		    
@@ -197,7 +189,7 @@
      * @throws Zend_Service_WindowsAzure_Exception
      */
     public function commit()
-    {
+    {    	
         // Perform batch
         $response = $this->_storageClient->performBatch($this->_operations, $this->_forTableStorage, $this->_isSingleSelect);
         
@@ -210,6 +202,7 @@
         
         // Error?
         if (count($errors[2]) > 0) {
+            require_once 'Zend/Service/WindowsAzure/Exception.php';
             throw new Zend_Service_WindowsAzure_Exception('An error has occured while committing a batch: ' . $errors[2][0]);
         }