diff --git a/lib/redfam.py b/lib/redfam.py
index 6a9402c..f36d1bc 100644
--- a/lib/redfam.py
+++ b/lib/redfam.py
@@ -284,6 +284,13 @@ class RedFamParser( RedFam ):
         for link in heading.ifilter_wikilinks():
             article = str( link.title ).strip()
 
+            # Short circuit empty links
+            if not article:
+                continue
+
+            # Make sure first letter is uppercase
+            article = article[0].upper() + article[1:]
+
             # Split in title and anchor part
             article = article.split("#", 1)
             # Replace underscores in title with spaces