Index: channels/links.py
==================================================================
--- channels/links.py
+++ channels/links.py
@@ -81,27 +81,24 @@
                 })
             except Exception as e:
                 log.ERR("links: adding entry failed:", e)
         
         # Add wiki or built-in link list
-        self.from_wiki()
-        for row in self.default:
-            (genre, title, homepage) = row
-            self.streams.append({
-                "genre": genre,
-                "title": title,
-                "homepage": homepage,
-                "type": "text/html",
-            })
+        try:
+            self.from_wiki()
+        except Exception as e:
+            log.ERR("Failure to retrieve /wiki/links\n", e)
+        for genre, title, homepage in self.default:
+            self.streams.append(dict(genre=genre, title=title, homepage=homepage, type="text/html"))
 
         # add to bookmarks
         return self.streams
 
 
     # retrieve links from repository wiki page (via JSON API /json/wiki/get/…)
     def from_wiki(self):
-        src = ahttp.get("https://fossil.include-once.org/streamtuner2/json/wiki/get/links", timeout=2)
+        src = ahttp.get("https://fossil.include-once.org/streamtuner2/json/wiki/get/links", timeout=2.0)
         if not src:
             return
         wiki = json.loads(src)
         if not wiki or not wiki.get("payload"):
             return