From ccd2eac43743d9904da99d7aef4c05e8d5ab26e4 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Fri, 14 Apr 2017 11:24:48 -0600
Subject: [PATCH] Move move into try/catch block

---
 classes/admincontroller.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/classes/admincontroller.php b/classes/admincontroller.php
index 0a133a14..051a9a55 100644
--- a/classes/admincontroller.php
+++ b/classes/admincontroller.php
@@ -491,12 +491,14 @@ class AdminController extends AdminBaseController
 
             $original_order = intval(trim($obj->order(), '.'));
 
-            // Change parent if needed and initialize move (might be needed also on ordering/folder change).
-            $obj = $obj->move($parent);
-            $this->preparePage($obj, false, $obj->language());
+
 
             try {
+                // Change parent if needed and initialize move (might be needed also on ordering/folder change).
+                $obj = $obj->move($parent);
+                $this->preparePage($obj, false, $obj->language());
                 $obj->validate();
+
             } catch (\Exception $e) {
                 $this->admin->setMessage($e->getMessage(), 'error');