diff --git a/sparse-beacon/src/lib.rs b/sparse-beacon/src/lib.rs
index eb2aec9..535bccc 100644
--- a/sparse-beacon/src/lib.rs
+++ b/sparse-beacon/src/lib.rs
@@ -66,8 +66,6 @@ where
     let mut config: messages::BeaconConfig = {
         let client = callback::obtain_https_client(&host_adapter, &params).await?;
 
-        dbg!(&params.beacon_identifier);
-
         make_request(
             &client,
             format!("https://{}/checkin", params::domain_name::<A>(&params)?).parse()?,
diff --git a/sparse-handler/src/router.rs b/sparse-handler/src/router.rs
index 48e364b..3117d2b 100644
--- a/sparse-handler/src/router.rs
+++ b/sparse-handler/src/router.rs
@@ -94,15 +94,18 @@ pub async fn handle_checkin(
                 .fetch_optional(&state.db)
                 .await?;
 
-            if let Some(category_id) = template_category.map(|r| r.default_category) {
-                sqlx::query!(
+            if let Some(category_id) = template_category.map(|r| r.default_category).flatten() {
+                if let Err(e) = sqlx::query!(
                     "INSERT INTO beacon_category_assignment (category_id, beacon_id)
                     VALUES (?, ?)",
                     category_id,
                     reg.beacon_id
                 )
                     .execute(&state.db)
-                    .await?;
+                    .await {
+                    tracing::warn!("Could not assign beacon to default category: {e:?}");
+                    return Err(e.into());
+                };
             }
 
             sqlx::query!(
@@ -138,6 +141,7 @@ pub async fn handle_checkin(
         }
     };
 
+        tracing::debug!("Here 5");
     let now = chrono::Utc::now();
     sqlx::query!(
         r"INSERT INTO beacon_checkin (beacon_id, checkin_date) VALUES (?, ?)"r,
diff --git a/sparse-server/src/webserver.rs b/sparse-server/src/webserver.rs
index 7507bcf..292b647 100644
--- a/sparse-server/src/webserver.rs
+++ b/sparse-server/src/webserver.rs
@@ -469,7 +469,8 @@ async fn handle_listener_events(
                     category_ids: category_ids.iter().map(|r| r.category_id).collect()
                 };
 
-                socket.send(ws::Message::Text(serde_json::to_string(&beacon)?)).await?;
+                let json = serde_json::to_string(&SidebarEvents::NewBeacon(beacon))?;
+                socket.send(ws::Message::Text(json)).await?;
             }
             Err(e) => {
                 tracing::warn!("Unable to handle general event: {e:?}");