diff --git a/lib/server/rest.js b/lib/server/rest.js
index f45c66a2..14a3f0f1 100644
--- a/lib/server/rest.js
+++ b/lib/server/rest.js
@@ -140,10 +140,10 @@
             case 'PUT':
                 if (lQuery === 'dir')
                     fs.mkdir(p.name, function(pError) {
-                        if (!pError)
-                            sendMsg(pParams, 'make dir', p.name);
-                        else
+                        if (pError)
                             sendError(pParams, pError);
+                        else
+                            sendMsg(pParams, 'make dir', p.name);
                     });
                 
                 else
@@ -166,10 +166,10 @@
             case 'DELETE':
                 if (lQuery === 'dir')
                     fs.rmdir(p.name, function(pError){
-                        if (!pError)
-                            sendMsg(pParams, 'delete', p.name);
-                        else
+                        if (pError)
                             sendError(pParams, pError);
+                        else
+                            sendMsg(pParams, 'delete', p.name);
                         });
                 else if (lQuery === 'files') {
                     getBody(p.request, function(pBody) {
@@ -216,10 +216,10 @@
                     });
                 }else
                     fs.unlink(p.name, function(pError) {
-                        if (!pError)
-                            sendMsg(pParams, 'delete', p.name);
-                        else
+                        if (pError)
                             sendError(pParams, pError);
+                        else
+                            sendMsg(pParams, 'delete', p.name);
                     });
                 
                 break;
@@ -308,10 +308,10 @@
             case 'mv':
                 if( Util.checkObjTrue(lFiles, ['from', 'to']) )
                     fs.rename(lFiles.from, lFiles.to, function(pError) {
-                        if(!pError)
-                            sendResponse(pParams);
-                        else
+                        if (pError)
                             sendError(pParams, pError);
+                        else
+                            sendResponse(pParams);
                     });
                 else
                     sendError(pParams, p.data);