From c99bedf1112c702c4dbd061b8cbf76d24c57b386 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Thu, 5 May 2016 10:35:40 -0600
Subject: [PATCH] Better error messages for exceptions thrown in
 `obj->validate()` #594

---
 classes/controller.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/classes/controller.php b/classes/controller.php
index 2a78cbe1..c29948cc 100644
--- a/classes/controller.php
+++ b/classes/controller.php
@@ -1495,7 +1495,12 @@ class AdminController
             // Reset slug and route. For now we do not support slug twig variable on save.
             $obj->slug($original_slug);
 
-            $obj->validate();
+            try {
+                $obj->validate();
+            } catch (\Exception $e) {
+                $this->admin->setMessage($e->getMessage(), 'error');
+                return false;
+            }
             $obj->filter();
 
             // rename folder based on visible
@@ -1518,7 +1523,12 @@ class AdminController
             // Handle standard data types.
             $obj = $this->prepareData($data);
             $obj = $this->processFiles($obj);
-            $obj->validate();
+            try {
+                $obj->validate();
+            } catch (\Exception $e) {
+                $this->admin->setMessage($e->getMessage(), 'error');
+                return false;
+            }
             $obj->filter();
         }