diff --git a/oidc_provider/models.py b/oidc_provider/models.py
index e467b47..ba09224 100644
--- a/oidc_provider/models.py
+++ b/oidc_provider/models.py
@@ -133,9 +133,9 @@ class UserInfo(models.Model):
     @property
     def address_formatted(self):
         formatted = ', '.join([
-            self.address_street_address,
-            self.address_locality,
-            self.address_country])
+            self.address_street_address or '',
+            self.address_locality or '',
+            self.address_country or ''])
 
         if formatted.startswith(', '):
             formatted = formatted[2:]