diff --git a/lib/server/size.js b/lib/server/size.js
index 55fd2d04..da94d495 100644
--- a/lib/server/size.js
+++ b/lib/server/size.js
@@ -54,7 +54,10 @@
             fileCounter     = 1,
             
             execCallBack    = function () {
-                if (!fileCounter && !asyncRunning)
+                var noErrors    = !wasError || !stopOnError,
+                    yesAllDone   = !fileCounter && !asyncRunning;
+                
+                if (yesAllDone && noErrors)
                     callback();
             },
             
@@ -71,8 +74,10 @@
             
             if (!wasError || !stopOnError) {
                 if (error) {
-                    wasError    = true;
-                    callback(error);
+                    if (stopOnError) {
+                        wasError    = true;
+                        callback(error);
+                    }
                 } else {
                     isDir   = stat.isDirectory();