diff --git a/controllers/class.RemoveDocument.php b/controllers/class.RemoveDocument.php
index 282300e05..6371ec1e1 100644
--- a/controllers/class.RemoveDocument.php
+++ b/controllers/class.RemoveDocument.php
@@ -36,7 +36,10 @@ class SeedDMS_Controller_RemoveDocument extends SeedDMS_Controller_Common {
 		$docname = $document->getName();
 		$documentid = $document->getID();
 
-		if(!$this->callHook('preRemoveDocument')) {
+		if(false === $this->callHook('preRemoveDocument')) {
+			if(empty($this->errormsg))
+				$this->errormsg = 'hook_preRemoveDocument_failed';
+			return null;
 		}
 
 		$result = $this->callHook('removeDocument', $document);
diff --git a/controllers/class.RemoveFolder.php b/controllers/class.RemoveFolder.php
index d8ae53128..c41b7f74f 100644
--- a/controllers/class.RemoveFolder.php
+++ b/controllers/class.RemoveFolder.php
@@ -34,7 +34,10 @@ class SeedDMS_Controller_RemoveFolder extends SeedDMS_Controller_Common {
 		$foldername = $folder->getName();
 		$folderid = $folder->getID();
 
-		if(!$this->callHook('preRemoveFolder')) {
+		if(false === $this->callHook('preRemoveFolder')) {
+			if(empty($this->errormsg))
+				$this->errormsg = 'hook_preRemoveFolder_failed';
+			return null;
 		}
 
 		$result = $this->callHook('removeFolder', $folder);