diff --git a/ProjectLighthouse/Controllers/SlotsController.cs b/ProjectLighthouse/Controllers/SlotsController.cs
index 4e8b89fd..0d4764db 100644
--- a/ProjectLighthouse/Controllers/SlotsController.cs
+++ b/ProjectLighthouse/Controllers/SlotsController.cs
@@ -34,6 +34,8 @@ namespace LBPUnion.ProjectLighthouse.Controllers {
                 .Include(s => s.Location)
                 .FirstOrDefaultAsync(s => s.SlotId == id);
 
+            if(slot == null) return this.NotFound();
+
             return this.Ok(slot.Serialize());
         }
     }