diff --git a/pg/fill-abook.sql b/pg/fill-abook.sql
index eaba449..6ba9f02 100644
--- a/pg/fill-abook.sql
+++ b/pg/fill-abook.sql
@@ -4,8 +4,14 @@ CREATE TABLE
     abook (count, name, address)
 AS SELECT
     DISTINCT ON(lower(address))
-    named.count,
-    named.name || lower(unnamed.address),
+    CASE WHEN
+        named.count IS NULL THEN 1
+        ELSE named.count
+    END,
+    CASE WHEN
+        named.name IS NULL THEN lower(unnamed.address)
+        ELSE named.name
+    END,
     lower(unnamed.address)
 FROM
     contact unnamed