diff --git a/modules/file/file.controller.php b/modules/file/file.controller.php
index fb8c9a076..3bdd7c785 100644
--- a/modules/file/file.controller.php
+++ b/modules/file/file.controller.php
@@ -1971,8 +1971,16 @@ class FileController extends File
 	function triggerMoveDocument($obj)
 	{
 		$obj->upload_target_srls = $obj->document_srls;
-		executeQuery('file.updateFileModule', $obj);
-		executeQuery('file.updateFileModuleComment', $obj);
+		$output = executeQuery('file.updateFileModule', $obj);
+		if (!$output->toBool())
+		{
+			return $output;
+		}
+		$output = executeQuery('file.updateFileModuleComment', $obj);
+		if (!$output->toBool())
+		{
+			return $output;
+		}
 	}
 
 	function triggerAddCopyDocument(&$obj)
diff --git a/modules/file/queries/updateFileModuleComment.xml b/modules/file/queries/updateFileModuleComment.xml
index f053a1d4b..52c4e4b47 100644
--- a/modules/file/queries/updateFileModuleComment.xml
+++ b/modules/file/queries/updateFileModuleComment.xml
@@ -1,13 +1,13 @@
 <query id="updateFileModuleComment" action="update">
 	<tables>
-		<table name="files" />
-		<table name="comments" />
+		<table name="files" alias="f" />
+		<table name="comments" alias="c" />
 	</tables>
 	<columns>
-		<column name="files.module_srl" var="module_srl" filter="number" notnull="notnull" />
+		<column name="f.module_srl" var="module_srl" filter="number" notnull="notnull" />
 	</columns>
 	<conditions>
-		<condition operation="equal" column="files.upload_target_srl" default="comments.comment_srl" />
-		<condition operation="in" column="comments.document_srl" var="upload_target_srls" filter="number" notnull="notnull" pipe="and" />
+		<condition operation="equal" column="f.upload_target_srl" default="c.comment_srl" />
+		<condition operation="in" column="c.document_srl" var="upload_target_srls" filter="number" notnull="notnull" pipe="and" />
 	</conditions>
 </query>