diff --git a/core/views/caves.py b/core/views/caves.py
index 2498fb496..d4e26cb01 100644
--- a/core/views/caves.py
+++ b/core/views/caves.py
@@ -645,7 +645,10 @@ def edit_entrance(request, path="", caveslug=None, entslug=None):
             e = entrance #Entrance.objects.get(slug=slugname) # does not exist yet!
             e.save()
             gcl = GetCaveLookup()
-            c = gcl[slug]
+            if slug in gcl:
+                c = gcl[slug]
+            else:
+                c = Cave.objects.get(cave=c)
             nce = CaveAndEntrance.objects.filter(cave=c, entrance=e).count()
             if nce == 0 :
                 return slugname, letter