diff --git a/server/services/nodeService.js b/server/services/nodeService.js
index bd53f3d..6c8558a 100644
--- a/server/services/nodeService.js
+++ b/server/services/nodeService.js
@@ -121,10 +121,10 @@ angular.module('ffffng')
         function toNodeFilename(token, node, nodeSecrets) {
             return config.server.peersPath + '/' +
                 (
-                    node.hostname + '@' +
-                    node.mac + '@' +
+                    (node.hostname || '') + '@' +
+                    (node.mac || '') + '@' +
                     (node.key || '') + '@' +
-                    token + '@' +
+                    (token || '') + '@' +
                     (nodeSecrets.monitoringToken || '')
                 ).toLowerCase();
         }