diff --git a/cloudcmd.js b/cloudcmd.js
index 772ae1f4..ce51acea 100644
--- a/cloudcmd.js
+++ b/cloudcmd.js
@@ -257,7 +257,7 @@
                             if (error)
                                 main.sendError(error, p);
                             else
-                                main.sendResponse(p, data, NOT_LOG);
+                                main.sendResponse(data, p, NOT_LOG);
                         });
                 });
             }
diff --git a/lib/server/main.js b/lib/server/main.js
index 20f196b3..ee95d53d 100644
--- a/lib/server/main.js
+++ b/lib/server/main.js
@@ -303,13 +303,13 @@
      * @param Data      - данные
      * @param pName     - имя отсылаемого файла
      */
-    function sendResponse(params, data, notLog) {
+    function sendResponse(data, params, notLog) {
         var p, isGzip, head,
             ret = checkParams(params);
         
         if (ret) {
             p           = params;
-            data        = p.data || data;
+            data        = data;
             isGzip      = p.gzip && isGZIP(p.request);
             
             head        = generateHeaders({
@@ -377,14 +377,13 @@
      * send error response
      */
     function sendError(error, params) {
-        var p, ret     = checkParams(params);
+        var data, ret     = checkParams(params);
         
         if (ret) {
-            p           = params;
-            p.status    = FILE_NOT_FOUND;
-            p.data      = error.message || '' + error;
+            params.status    = FILE_NOT_FOUND;
+            data        = error.message || '' + error;
             
-            sendResponse(p);
+            sendResponse(data, params);
         }
     }
     
diff --git a/lib/server/rest.js b/lib/server/rest.js
index 80cbe91c..696a962a 100644
--- a/lib/server/rest.js
+++ b/lib/server/rest.js
@@ -76,7 +76,7 @@
                     if (error)
                         main.sendError(error, params);
                     else
-                        main.sendResponse(params, data, options.notLog);
+                        main.sendResponse(data, params, options.notLog);
                 });
             }
         }