diff --git a/subt_ign/CMakeLists.txt b/subt_ign/CMakeLists.txt
index 8bb7541e..bc14702b 100644
--- a/subt_ign/CMakeLists.txt
+++ b/subt_ign/CMakeLists.txt
@@ -153,6 +153,30 @@ install(TARGETS ${connection_validator_name}
   LIBRARY DESTINATION lib
   RUNTIME DESTINATION bin)
 
+add_executable(validate_connections
+  src/validate_connections.cc
+  src/ConnectionValidator.cc
+  src/ConnectionValidatorPrivate.cc
+  src/ConnectionHelper.cc
+  src/SimpleDOTParser.cc)
+target_link_libraries(validate_connections
+  PRIVATE
+    ignition-gazebo${IGN_GAZEBO_VER}::core
+    ignition-common3::ignition-common3
+    ignition-launch1::ignition-launch1
+    ignition-math6::ignition-math6
+    ignition-msgs4::ignition-msgs4
+    ignition-plugin1::loader
+    ignition-transport7::ignition-transport7
+    ${catkin_LIBRARIES}
+    ${protobuf_lib_name}
+)
+install(TARGETS validate_connections
+  ARCHIVE DESTINATION lib
+  LIBRARY DESTINATION lib
+  RUNTIME DESTINATION bin)
+
+
 # Create the libCommsBrokerPlugin.so library.
 set(comms_broker_plugin_name CommsBrokerPlugin)
 add_library(${comms_broker_plugin_name}
diff --git a/subt_ign/src/ConnectionValidatorPrivate.cc b/subt_ign/src/ConnectionValidatorPrivate.cc
index 5cf2bf87..daa7e4ce 100644
--- a/subt_ign/src/ConnectionValidatorPrivate.cc
+++ b/subt_ign/src/ConnectionValidatorPrivate.cc
@@ -327,18 +327,27 @@ void ConnectionValidatorPrivate::PopulateConnections()
       {
         for (auto cap: caps)
         {
-          if (point.Equal(cap, 1))
+          if (point.Equal(cap, 1.0))
           {
             igndbg << "Found cap!" << std::endl;
             found_caps += 1;
           }
+          else if (point.Equal(cap, 12.6))
+          {
+            igndbg << "Found cap (with expanded tolerance)" << std::endl;
+            found_caps += 1;
+          }
         }
       }
 
       if (actual + found_caps != data)
       {
-        igndbg << name << " " << actualConnections[name] << "/" << data <<
-          " (" << this->vertData[name].tileType << ")" << std::endl;
+        igndbg << "Actual connections[" << actualConnections[name]
+               << "] do not match expected connections[" << data
+               << "] for tile name[" << name << "] with type["
+               << this->vertData[name].tileType << "]. "
+               << "Missing an end cap or connecting tile."
+               << std::endl;
       }
     }
   }
diff --git a/subt_ign/src/ConnectionValidator_TEST.cc b/subt_ign/src/validate_connections.cc
similarity index 87%
rename from subt_ign/src/ConnectionValidator_TEST.cc
rename to subt_ign/src/validate_connections.cc
index d52003a6..582cc817 100644
--- a/subt_ign/src/ConnectionValidator_TEST.cc
+++ b/subt_ign/src/validate_connections.cc
@@ -15,8 +15,8 @@
  *
  */
 
-/// Helper test to evaluate graph population without starting gazebo.
-/// Call with TEST_connection_validator <world_name>
+/// Helper to evaluate graph population without starting gazebo.
+/// Call with `validate_connections` <world_name>
 #include "ConnectionValidatorPrivate.hh"
 
 #include <ignition/common/Console.hh>