@@ -106,8 +106,9 @@ function xhr_to_syno(method, url_path, onload_function, max_retry, timeout) {

                 } else if (xhr.status == 0) { //timeout

                     console.log('------xhr timed out');

                     //send back "timeout" to watch

-                    message = "Time out";

-                    send_message_to_watch(message)

+                    //message = "Time out";

+                    //send_message_to_watch(message)

+                    onload_function(xhr);

                 } else { // why would this happen?

                     console.log('------xhr request returned error code ' + xhr.status);

                     message = "Error (XHR" + xhr.status + ")";

@@ -179,6 +180,9 @@ function authenticate(action_callback) {

                 } else if (response.error.code == 407) {

                     console.log('------Authentication failed because of IP Blocked');

                     message = "Authentication failed, IP is blocked";

+                }else if (xhr.status == 0){

+                    console.log('------Authentication failed because of request timed out');

+                    message = "Time out";

                 }

                 send_message_to_watch(message)

             }