diff --git a/controllers/class.RemoveFolder.php b/controllers/class.RemoveFolder.php
index 860fd9b0e..eec8f16f9 100644
--- a/controllers/class.RemoveFolder.php
+++ b/controllers/class.RemoveFolder.php
@@ -61,14 +61,15 @@ class SeedDMS_Controller_RemoveFolder extends SeedDMS_Controller_Common {
 			if (!$folder->remove()) {
 				$this->errormsg = 'error_occured';
 				return false;
-			} else {
-
-				if(!$this->callHook('postRemoveFolder')) {
-				}
-
 			}
-		} else
-			return $result;
+		} elseif($result === false) {
+			if(empty($this->errormsg))
+				$this->errormsg = 'hook_removeFolder_failed';
+			return false;
+		}
+
+		if(!$this->callHook('postRemoveFolder')) {
+		}
 
 		return true;
 	}