Add exception as per review.
Add exception as per review.

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