diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index 170da0aac..6b157ee13 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -2094,6 +2094,23 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	 */
 	function removeContent($version) { /* {{{ */
 		$this->_dms->lasterror = '';
+		$db = $this->_dms->getDB();
+
+        /* Make sure the version exists */
+        $queryStr = "SELECT * FROM `tblDocumentContent` WHERE `document` = " . $this->getID() . " AND `version` = " . $version->getVersion();
+		$resArr = $db->getResultArray($queryStr);
+		if (is_bool($resArr) && !$resArr)
+			return false;
+		if (count($resArr)==0)
+			return false;
+
+        /* Make sure this is not the last version */
+		$queryStr = "SELECT * FROM `tblDocumentContent` WHERE `document` = " . $this->getID();
+		$resArr = $db->getResultArray($queryStr);
+		if (is_bool($resArr) && !$resArr)
+			return false;
+		if (count($resArr)==1)
+			return false;
 
 		/* Check if 'onPreRemoveDocument' callback is set */
 		if(isset($this->_dms->callbacks['onPreRemoveContent'])) {