--- a/web/lib/Zend/Tool/Project/Provider/Model.php	Thu Mar 21 17:31:31 2013 +0100
+++ b/web/lib/Zend/Tool/Project/Provider/Model.php	Thu Mar 21 19:50:53 2013 +0100
@@ -15,15 +15,15 @@
  * @category   Zend
  * @package    Zend_Tool
  * @subpackage Framework
- * @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: Model.php 20851 2010-02-02 21:45:51Z ralph $
+ * @version    $Id: Model.php 24593 2012-01-05 20:35:02Z matthew $
  */
 
 /**
  * @category   Zend
  * @package    Zend_Tool
- * @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_Tool_Project_Provider_Model extends Zend_Tool_Project_Provider_Abstract
@@ -45,7 +45,7 @@
         }
 
         $newModel = $modelsDirectory->createResource(
-            'modelFile', 
+            'modelFile',
             array('modelName' => $modelName, 'moduleName' => $moduleName)
             );
 
@@ -67,9 +67,14 @@
         }
 
         $modelsDirectory = self::_getModelsDirectoryResource($profile, $moduleName);
+        
+        if (!$modelsDirectory instanceof Zend_Tool_Project_Profile_Resource) {
+            return false;
+        }
+        
         return (($modelsDirectory->search(array('modelFile' => array('modelName' => $modelName)))) instanceof Zend_Tool_Project_Profile_Resource);
     }
-    
+
     /**
      * _getModelsDirectoryResource()
      *
@@ -89,7 +94,7 @@
 
         return $profile->search($profileSearchParams);
     }
-    
+
     /**
      * Create a new model
      *
@@ -101,9 +106,9 @@
         $this->_loadProfile(self::NO_PROFILE_THROW_EXCEPTION);
 
         $originalName = $name;
-        
+
         $name = ucwords($name);
-        
+
         // determine if testing is enabled in the project
         $testingEnabled = false; //Zend_Tool_Project_Provider_Test::isTestingEnabled($this->_loadedProfile);
         $testModelResource = null;
@@ -112,18 +117,18 @@
         if (preg_match('#[_-]#', $name)) {
             throw new Zend_Tool_Project_Provider_Exception('Model names should be camel cased.');
         }
-        
+
         if (self::hasResource($this->_loadedProfile, $name, $module)) {
             throw new Zend_Tool_Project_Provider_Exception('This project already has a model named ' . $name);
         }
-        
+
         // get request/response object
         $request = $this->_registry->getRequest();
         $response = $this->_registry->getResponse();
-        
+
         // alert the user about inline converted names
         $tense = (($request->isPretend()) ? 'would be' : 'is');
-        
+
         if ($name !== $originalName) {
             $response->appendContent(
                 'Note: The canonical model name that ' . $tense
@@ -132,7 +137,7 @@
                 array('color' => array('yellow'))
                 );
         }
-        
+
         try {
             $modelResource = self::createResource($this->_loadedProfile, $name, $module);