diff --git a/etc/systemd/system/dd-re.service b/etc/systemd/system/dd-re.service
index 3cc90c0..8954489 100644
--- a/etc/systemd/system/dd-re.service
+++ b/etc/systemd/system/dd-re.service
@@ -7,6 +7,7 @@ Restart=always
 User=dd
 Group=dd
 WorkingDirectory=/srv/dd/re
+ExecStartPre=/usr/bin/wait-for-it -h pandora.dmp -p 80
 ExecStart=/srv/dd/re/server.py
 
 [Install]
diff --git a/recommendation_engine.py b/recommendation_engine.py
index 7482277..30cbbb7 100644
--- a/recommendation_engine.py
+++ b/recommendation_engine.py
@@ -49,7 +49,7 @@ class Engine:
         playlists = playlists[channels['keywords']:]
         # Count tags for the user
         count = {}
-        for event in user['events']:
+        for event in user.get('events', []):
             if 'product' in event['data']:
                 count[event['data']['product']] = count.get(
                     event['data']['product'], 0