Additional Error handling in the controllers.