diff --git a/src/index.html b/src/index.html
index d66d42e..3ebce95 100644
--- a/src/index.html
+++ b/src/index.html
@@ -202,6 +202,6 @@
 		</div>
 		<script src="/js/vendor/jquery.min.js"></script>
 		<script src="/js/vendor/bootstrap.min.js"></script>
-		<script src="/js/connectivity.js?v=3"></script>
+		<script src="/js/connectivity.js?v=4"></script>
 	</body>
 </html>
\ No newline at end of file
diff --git a/src/js/connectivity.js b/src/js/connectivity.js
index 7c44408..31add85 100644
--- a/src/js/connectivity.js
+++ b/src/js/connectivity.js
@@ -50,6 +50,16 @@ function test_ipv6() {
 		dataType: "json",
 		timeout: 15000,
 		success: function(resp) {
+			if (resp.address.includes(".")) {
+				$p.find(".proto_supported").html("<span class='label label-warning' style='font-size:1em'>Browser error</span>");
+				$p.find(".proto_icmp").html("<span class='label label-warning' style='font-size:1em'>Not tested</span>");
+				$p.find(".proto_address").html("<span class='address'>n/a</span>");
+				$p.find(".proto_hostname").html("<span class='label label-warning'>Not tested</span>")
+				$p.find(".proto_isp").prev().html("Error")
+				$p.find(".proto_isp").html("Your browser doesn't support IPv6 properly. Please check out <a href='https://bugzilla.mozilla.org/show_bug.cgi?id=1709564'>this bug</a> if you are using Firefox.");
+				return;
+			}
+
 			$p.find(".proto_supported").html("<span class='label label-success' style='font-size:1em'>Supported</span>");
 			$p.find(".proto_address").html("<span class='address'>" + resp.address + "</span>");
 			$p.find(".proto_isp").html("<img class='img-flag' src='/img/flags/" + resp.country + ".png' title='" + resp.country + "' />" + resp.asn);
@@ -132,7 +142,7 @@ function test_browser() {
 			}
 		},
 		error: function(xopt, err) {
-			$p.find(".browser_default").html("<span class='label label-default'>Test failed</span>");
+			$p.find(".browser_default").html("<span class='label label-danger'>Test failed</span>");
 		},
 	});
 }
@@ -148,7 +158,7 @@ function test_dns() {
 			if (resp.protocol === "4") {
 				$p.find(".dns_dns4_ip4").html("<span class='label label-success'>Reachable</span>");
 			} else {
-				$p.find(".dns_dns4_ip4").html("<span class='label label-default'>Test failed</span>");
+				$p.find(".dns_dns4_ip4").html("<span class='label label-danger'>Test failed</span>");
 			}
 		},
 		error: function(xopt, err) {
@@ -163,7 +173,7 @@ function test_dns() {
 			if (resp.protocol === "6") {
 				$p.find(".dns_dns4_ip6").html("<span class='label label-success'>Reachable</span>");
 			} else {
-				$p.find(".dns_dns4_ip6").html("<span class='label label-default'>Test failed</span>");
+				$p.find(".dns_dns4_ip6").html("<span class='label label-danger'>Test failed</span>");
 			}
 		},
 		error: function(xopt, err) {
@@ -178,7 +188,7 @@ function test_dns() {
 			if (resp.protocol === "4") {
 				$p.find(".dns_dns6_ip4").html("<span class='label label-success'>Reachable</span>");
 			} else {
-				$p.find(".dns_dns6_ip4").html("<span class='label label-default'>Test failed</span>");
+				$p.find(".dns_dns6_ip4").html("<span class='label label-danger'>Test failed</span>");
 			}
 		},
 		error: function(xopt, err) {
@@ -193,7 +203,7 @@ function test_dns() {
 			if (resp.protocol === "6") {
 				$p.find(".dns_dns6_ip6").html("<span class='label label-success'>Reachable</span>");
 			} else {
-				$p.find(".dns_dns6_ip6").html("<span class='label label-default'>Test failed</span>");
+				$p.find(".dns_dns6_ip6").html("<span class='label label-danger'>Test failed</span>");
 			}
 		},
 		error: function(xopt, err) {