rinde
diff --git a/‎core/src/main/java/com/github/rinde/rinsim/core/model/road/GraphRoadModelImpl.java‎
Lines changed: 1 addition & 4 deletions b/‎core/src/main/java/com/github/rinde/rinsim/core/model/road/GraphRoadModelImpl.java‎
Lines changed: 1 addition & 4 deletions
diff --git a/‎core/src/main/java/com/github/rinde/rinsim/core/model/road/GraphSpatialRegistry.java‎
Lines changed: 9 additions & 0 deletions b/‎core/src/main/java/com/github/rinde/rinsim/core/model/road/GraphSpatialRegistry.java‎
Lines changed: 9 additions & 0 deletions
@@ -474,10 +474,7 @@ public Graph<? extends ConnectionData> getGraph() {
    */
   @Override
   public Optional<? extends Connection<?>> getConnection(RoadUser obj) {
-    if (registry().isOnConnection(obj)) {
-      return Optional.of(registry.getConnection(obj));
-    }
-    return Optional.absent();
+    return registry.getOptionalConnection(obj);
   }
 
   @Override
 
@@ -25,6 +25,7 @@
 import com.github.rinde.rinsim.geom.Connection;
 import com.github.rinde.rinsim.geom.Point;
 import com.google.auto.value.AutoValue;
+import com.google.common.base.Optional;
 import com.google.common.collect.LinkedHashMultimap;
 import com.google.common.collect.SetMultimap;
 
@@ -133,6 +134,14 @@ public Connection<?> getConnection(T ru) {
     return connLocMap.get(ru).connection();
   }
 
+  public Optional<? extends Connection<?>> getOptionalConnection(T ru) {
+    final ConnLoc cl = connLocMap.get(ru);
+    if (cl == null) {
+      return Optional.absent();
+    }
+    return Optional.of(cl.connection());
+  }
+
   public double getRelativePosition(Point p) {
     if (!posMap.containsKey(p)) {
       return 0d;