diff --git a/enzevalos_iphone/AddressHandler.swift b/enzevalos_iphone/AddressHandler.swift
index 969812e8fbaeb8dec9b93ed9e461caef2574c7f8..910c7ebf23219c13f4c149b082bd5f2b279f5083 100644
--- a/enzevalos_iphone/AddressHandler.swift
+++ b/enzevalos_iphone/AddressHandler.swift
@@ -180,6 +180,9 @@ class AddressHandler {
                 break
             }
             var insertedEntry = false
+            if con.addressNames.isEmpty {
+                continue
+            }
             var address = con.addresses.first!
             if let a = con.ezContact.getMailAddresses().first {
                 address = a
diff --git a/enzevalos_iphone/ContactViewController.swift b/enzevalos_iphone/ContactViewController.swift
index ca76058fb31b7eca065882d418dcdc89ac53261a..e45922b71afc68d8c32284b20c3f3db4914cec3f 100644
--- a/enzevalos_iphone/ContactViewController.swift
+++ b/enzevalos_iphone/ContactViewController.swift
@@ -61,7 +61,6 @@ class ContactViewController: UIViewController {
             } else {
                 self.title = con.name
             }
-//            self.title = CNContactFormatter.stringFromContact(con.ezContact.cnContact, style: .FullName)
 
             prepareContactSheet()