diff --git a/lib/agent/providers/network/index.js b/lib/agent/providers/network/index.js
index <HASH>..<HASH> 100644
--- a/lib/agent/providers/network/index.js
+++ b/lib/agent/providers/network/index.js
@@ -161,7 +161,17 @@ exp.get_access_points_list = function(callback){
     if (err || !nic_name)
       return callback(new Error(err || 'No wireless adapter found.'));
 
-    os_functions.access_points_list(nic_name, callback);
+    os_functions.access_points_list(nic_name, function(err, list){
+      if (err || !list)
+        return callback(err || new Error('No access points found.'))
+
+      // sort them from the nearest to the farthest
+      list.sort(function(a, b){
+        return a.signal_strength > b.signal_strength;
+      });
+
+      return callback(null, list);
+    });
   });
 
 };
@@ -214,11 +224,6 @@ exp.get_open_access_points_list = function(callback){
     if (open_aps.length === 0)
       return callback(null, []);
 
-    // sort them from the nearest to the farthest
-    open_aps.sort(function(a, b){
-      return a.signal_strength > b.signal_strength;
-    });
-
     callback(null, open_aps);
   });
Network get_access_points_list: sort APs by proximity.