Tweak exception handling code.
Tweak exception handling code.

cakephp/cakephp,cakephp/cakephp,ADmad/cakephp,ADmad/cakephp,ADmad/cakephp,CakeDC/cakephp,cakephp/cakephp,ndm2/cakephp,ADmad/cakephp,ndm2/cakephp,dakota/cakephp,ndm2/cakephp,CakeDC/cakephp,CakeDC/cakephp,cakephp/cakephp,dakota/cakephp,CakeDC/cakephp,ndm2/cakephp,dakota/cakephp,dakota/cakephp