diff --git a/poppy/model/helpers/domain.py b/poppy/model/helpers/domain.py
index 09073c70..cf7dcd98 100644
--- a/poppy/model/helpers/domain.py
+++ b/poppy/model/helpers/domain.py
@@ -125,6 +125,6 @@ class Domain(common.DictSerializableModel):
         res = super(Domain, self).to_dict()
         # cert info is a temporary property when
         # trying to create cert, so skip serialization
-        if 'cert_info' in res:
+        if 'cert_info' in res and res['cert_info'] is not None:
             res['cert_info'] = res['cert_info'].to_dict()
         return res
diff --git a/poppy/model/helpers/provider_details.py b/poppy/model/helpers/provider_details.py
index 7b020bae..4729ea1d 100644
--- a/poppy/model/helpers/provider_details.py
+++ b/poppy/model/helpers/provider_details.py
@@ -156,7 +156,7 @@ class ProviderDetail(common.DictSerializableModel):
         :param domain
         '''
         for access_url in self.access_urls:
-            if access_url['domain'] == domain:
+            if access_url.get('domain') == domain:
                 return access_url
         return None