diff --git a/controllers/class.EditFolder.php b/controllers/class.EditFolder.php
index eeaf02634..f41399fe5 100644
--- a/controllers/class.EditFolder.php
+++ b/controllers/class.EditFolder.php
@@ -84,11 +84,14 @@ class SeedDMS_Controller_EditFolder extends SeedDMS_Controller_Common {
 				}
 			}
 
-			if(!$this->callHook('postEditFolder')) {
-			}
+		} elseif($result === false) {
+			if(empty($this->errormsg))
+				$this->errormsg = 'hook_editFolder_failed';
+			return false;
+		}
 
-		} else
-			return $result;
+		if(!$this->callHook('postEditFolder')) {
+		}
 
 		return true;
 	}