diff --git a/common/js/plugins/jquery.fileupload/js/main.js b/common/js/plugins/jquery.fileupload/js/main.js
index c8d5db3b6..344b0fe7c 100644
--- a/common/js/plugins/jquery.fileupload/js/main.js
+++ b/common/js/plugins/jquery.fileupload/js/main.js
@@ -16,24 +16,34 @@
 			this.editor_sequence = $container.data('editor-sequence');
 
 			var settings = {
-				url: '/core-origin/index.php?act=procFileUpload&module=file',
+				url: request_uri.setQuery('module', 'file').setQuery('act', 'procFileUpload'),
 				autoUpload: true,
 				formData: {"editor_sequence": data.editorSequence, "upload_target_srl" : data.uploadTargetSrl},
 				dataType: 'json',
 				dropZone: $container,
-				done: function() {
-					self.done.call(self, arguments);
+				done: function(e, res) {
+					var result = res.result;
+					this.uploadedBytes += res.fi
+
+					if(result.error == 0) {
+						this.uploadedBytes += res.total;
+						self.done.call(self, arguments);
+					} else {
+						alert(result.message);
+					}
+				},
+				stop: function() {
+					self.loadFilelist();
 				},
 				start: function() {
-					$('#progress').show();
+					$('#progress').find('.progress-bar').width(0).addBack().show();
 				},
 				progressall: function (e, data) {
 					var progress = parseInt(data.loaded / data.total * 100, 10);
-					$('#progress .progress-bar').width(progress+'%');
+					$('.progress-bar').width(progress+'%');
 
 					if(progress >= 100) {
 						$('#progress').delay(5000).slideUp();
-						self.displayPreview($('.xe-uploader-filelist select option:last').data('fileinfo'));
 					}
 				}
 			};
@@ -66,7 +76,6 @@
 
 			this.loadFilelist();
 
-
 			// 본문 삽입
 			$('.xe-act-link-selected').on('click', function() {
 				self.insertToContent();
@@ -76,12 +85,9 @@
 			$('.xe-act-delete-selected').on('click', function() {
 				self.deleteFile();
 			});
-
-
 		},
 		done: function() {
-			this.loadFilelist();
-
+			// this.loadFilelist();
 		},
 		insertToContent: function() {
 			for(var i = 0, len = this.selected_files.length; i < len; i++) {
@@ -125,13 +131,15 @@
 						.val(file.file_srl)
 						.appendTo('.xe-uploader-filelist select');
 				});
-				// self.displayPreview($('.xe-uploader-filelist select option:last').data('fileinfo'));
+				self.displayPreview($('.xe-uploader-filelist select option:last').data('fileinfo'));
 			});
 		},
 		selectFile: function() {
 			this.displayPreview($(this.last_selected_file).data('fileinfo'));
 		},
 		displayPreview: function(fileinfo) {
+			if(!fileinfo) return;
+
 			if(/\.(jpe?g|png|gif)$/i.test(fileinfo.download_url)) {
 				$('.xe-uploader-preview img').attr('src', window.request_uri + fileinfo.download_url);
 			} else {
diff --git a/modules/editor/skins/ckeditor/editor.html b/modules/editor/skins/ckeditor/editor.html
index c173300f2..730cb24a5 100755
--- a/modules/editor/skins/ckeditor/editor.html
+++ b/modules/editor/skins/ckeditor/editor.html
@@ -59,7 +59,11 @@
 	<script>
 		(function($) {/**/
 			$(function () {/**/
-				var uploader = $('#fileUploaderContainer_{$editor_sequence}').xeUploader();
+				var setting = {
+					maxFileSize: {$file_config->allowed_filesize},
+					limitMultiFileUploadSize: {$file_config->allowed_filesize},
+				};
+				var uploader = $('#fileUploaderContainer_{$editor_sequence}').xeUploader(setting);
 			});
 		}) (jQuery);
 	</script>
diff --git a/modules/file/file.controller.php b/modules/file/file.controller.php
index e66a5e1e6..4676f8ede 100644
--- a/modules/file/file.controller.php
+++ b/modules/file/file.controller.php
@@ -45,6 +45,7 @@ class fileController extends file
 
 		$output = $this->insertFile($file_info, $module_srl, $upload_target_srl);
 		Context::setResponseMethod('JSON');
+		if($output->error != '0') $this->stop($output->message);
 	}
 
 	/**