diff --git a/CHANGELOG b/CHANGELOG
index 1b088df..bf78bcf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,9 @@
 # Offpunk History
 
+## 1.0 - Unreleased
+- Fixed a crash when accessing links in list (thanks Matthieu Talbot for the report)
+- Fixed a crash due to a typo in a variable name rarely accessed.
+
 ## 0.9 - March 05th 2022
 - Initial Spartan protocol support
 - Http links with content above 20Mo are not downloaded during sync (except when explicitely requested)
diff --git a/offpunk.py b/offpunk.py
index 84b2d8a..54f77db 100755
--- a/offpunk.py
+++ b/offpunk.py
@@ -3131,9 +3131,10 @@ archives, which is a special historical list limited in size. It is similar to `
         else:
             gi = GeminiItem("file://" + list_path,list)
             gi = gi.get_link(int(line))
-            display = not self.sync_only 
-            self._go_to_gi(gi,handle=display)
-            return gi.url
+            display = not self.sync_only
+            if gi:
+                self._go_to_gi(gi,handle=display)
+                return gi.url
 
     def list_show(self,list):
         list_path = self.list_path(list)