diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java
index eb5a129..f61ce72 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java
@@ -960,14 +960,8 @@ public class MemberTableModel extends AbstractTableModel implements TableModelLi
 
         for (int i=0; i<members.size(); ++i) {
             final RelationMember m = members.get(i);
-            if (! m.isWay()) {
-                con.set(i, new WayConnectionType());
-                firstGroupIdx = i;
-                continue;
-            }
-
-            final Way w = m.getWay();
-            if (w == null || w.isIncomplete()) {
+            if (!m.isWay() || m.getWay() == null || m.getWay().isIncomplete()) {
+                if(i > 0) makeLoopIfNeeded(con, i-1);
                 con.set(i, new WayConnectionType());
                 firstGroupIdx = i;
                 continue;