diff --git a/xos/hpc_observer/steps/sync_cdnprefix.py b/xos/hpc_observer/steps/sync_cdnprefix.py
index 584e591..58cda11 100644
--- a/xos/hpc_observer/steps/sync_cdnprefix.py
+++ b/xos/hpc_observer/steps/sync_cdnprefix.py
@@ -65,7 +65,7 @@
         logger.info("sync'ing cdn prefix %s" % str(cp))
 
         if (not cp.contentProvider) or (not cp.contentProvider.content_provider_id):
-            return
+            raise Exception("CDN Prefix %s is linked to a contentProvider without an id" % str(cp))
 
         cpid = cp.contentProvider.content_provider_id
 
@@ -75,8 +75,7 @@
             if (not cp.defaultOriginServer.origin_server_id):
                 # It's probably a bad idea to try to set defaultOriginServer before
                 # we've crated defaultOriginServer.
-                logger.info("   cdn prefix %s is waiting for it's default origin server to get an id" % str(cp))
-                return
+                raise Exception("cdn prefix %s is waiting for it's default origin server to get an id" % str(cp))
 
             cp_dict["default_origin_server"] = cp.defaultOriginServer.url
 
diff --git a/xos/hpc_observer/steps/sync_contentprovider.py b/xos/hpc_observer/steps/sync_contentprovider.py
index bd16e39..bf96421 100644
--- a/xos/hpc_observer/steps/sync_contentprovider.py
+++ b/xos/hpc_observer/steps/sync_contentprovider.py
@@ -50,7 +50,7 @@
         account_name = self.make_account_name(cp.name)
 
         if (not cp.serviceProvider) or (not cp.serviceProvider.service_provider_id):
-            return
+            raise Exception("ContentProvider %s is linked to a serviceProvider with no id" % str(cp))
 
         spid = cp.serviceProvider.service_provider_id
 
diff --git a/xos/hpc_observer/steps/sync_originserver.py b/xos/hpc_observer/steps/sync_originserver.py
index b9569fc..d8baea4 100644
--- a/xos/hpc_observer/steps/sync_originserver.py
+++ b/xos/hpc_observer/steps/sync_originserver.py
@@ -53,7 +53,7 @@
         logger.info("sync'ing origin server %s" % str(ors))
 
         if (not ors.contentProvider) or (not ors.contentProvider.content_provider_id):
-            return
+            raise Exception("Origin Server %s is linked to a contentProvider with no id" % str(ors))
 
         cpid = ors.contentProvider.content_provider_id