Merge remote-tracking branch 'origin/master'

server/util-server.js

@@ -87,8 +87,14 @@ exports.ping = async (hostname, size = 56) => {
         return await exports.pingAsync(hostname, false, size);
     } catch (e) {
         // If the host cannot be resolved, try again with ipv6
-        // As node-ping does not report a specific error for this, try again with ipv6 no matter what.
-        return await exports.pingAsync(hostname, true, size);
+        console.debug("ping", "IPv6 error message: " + e.message);
+
+        // As node-ping does not report a specific error for this, try again if it is an empty message with ipv6 no matter what.
+        if (!e.message) {
+            return await exports.pingAsync(hostname, true, size);
+        } else {
+            throw e;
+        }
     }
 };