diff --git a/common/archcheck.cc b/common/archcheck.cc
index 7b727e9b..12d4b5d3 100644
--- a/common/archcheck.cc
+++ b/common/archcheck.cc
@@ -38,21 +38,27 @@ void archcheck_names(const Context *ctx)
     for (BelId bel : ctx->getBels()) {
         IdString name = ctx->getBelName(bel);
         BelId bel2 = ctx->getBelByName(name);
-        log_assert(bel == bel2);
+        if(bel != bel2) {
+            log_error("bel != bel2, name = %s\n", name.c_str(ctx));
+        }
     }
 
     log_info("Checking wire names..\n");
     for (WireId wire : ctx->getWires()) {
         IdString name = ctx->getWireName(wire);
         WireId wire2 = ctx->getWireByName(name);
-        log_assert(wire == wire2);
+        if(wire != wire2) {
+            log_error("wire != wire2, name = %s\n", name.c_str(ctx));
+        }
     }
 #ifndef ARCH_ECP5
     log_info("Checking pip names..\n");
     for (PipId pip : ctx->getPips()) {
         IdString name = ctx->getPipName(pip);
         PipId pip2 = ctx->getPipByName(name);
-        log_assert(pip == pip2);
+        if(pip != pip2) {
+            log_error("pip != pip2, name = %s\n", name.c_str(ctx));
+        }
     }
 #endif
     log_break();
@@ -117,15 +123,77 @@ void archcheck_locs(const Context *ctx)
 
 void archcheck_conn(const Context *ctx)
 {
-#if 0
     log_info("Checking connectivity data.\n");
 
-    log_info("Checking all wires..\n");
+    log_info("Checking all wires...\n");
+
     for (WireId wire : ctx->getWires())
     {
-        ...
+        for(BelPin belpin : ctx->getWireBelPins(wire)) {
+            WireId wire2 = ctx->getBelPinWire(belpin.bel, belpin.pin);
+            log_assert(wire == wire2);
+        }
+
+        for(PipId pip : ctx->getPipsDownhill(wire)) {
+            WireId wire2 = ctx->getPipSrcWire(pip);
+            log_assert(wire == wire2);
+        }
+
+        for(PipId pip : ctx->getPipsUphill(wire)) {
+            WireId wire2 = ctx->getPipDstWire(pip);
+            log_assert(wire == wire2);
+        }
+    }
+
+    log_info("Checking all BELs...\n");
+    for (BelId bel : ctx->getBels()) {
+        for(IdString pin : ctx->getBelPins(bel)) {
+            WireId wire = ctx->getBelPinWire(bel, pin);
+
+            if(wire == WireId()) {
+                continue;
+            }
+
+            bool found_belpin = false;
+            for(BelPin belpin : ctx->getWireBelPins(wire)) {
+                if(belpin.bel == bel && belpin.pin == pin) {
+                    found_belpin = true;
+                    break;
+                }
+            }
+
+            log_assert(found_belpin);
+        }
+    }
+
+    log_info("Checking all PIPs...\n");
+    for (PipId pip : ctx->getPips()) {
+        WireId src_wire = ctx->getPipSrcWire(pip);
+        if(src_wire != WireId()) {
+            bool found_pip = false;
+            for(PipId downhill_pip : ctx->getPipsDownhill(src_wire)) {
+                if(pip == downhill_pip) {
+                    found_pip = true;
+                    break;
+                }
+            }
+
+            log_assert(found_pip);
+        }
+
+        WireId dst_wire = ctx->getPipDstWire(pip);
+        if(dst_wire != WireId()) {
+            bool found_pip = false;
+            for(PipId uphill_pip : ctx->getPipsUphill(dst_wire)) {
+                if(pip == uphill_pip) {
+                    found_pip = true;
+                    break;
+                }
+            }
+
+            log_assert(found_pip);
+        }
     }
-#endif
 }
 
 } // namespace