diff --git a/api/routes/characters.js b/api/routes/characters.js
index 7ddc37d..4c13c08 100644
--- a/api/routes/characters.js
+++ b/api/routes/characters.js
@@ -28,7 +28,7 @@ router.get('/characters', async (req, res) => {
 router.get('/characters/:character_id', async (req, res) => {
     let character = await Character.findByPk(req.params.character_id);
 
-    if (!character.enabled && !isAuthorized(req)) {
+    if (!character || !character.enabled && !isAuthorized(req)) {
         res.status(404).json({ error: 'Character not found' });
         return;
     }
diff --git a/api/routes/groups.js b/api/routes/groups.js
index de55e5a..bddf82c 100644
--- a/api/routes/groups.js
+++ b/api/routes/groups.js
@@ -28,7 +28,7 @@ router.get('/groups', async (req, res) => {
 router.get('/groups/:group_id', async (req, res) => {
     let group = await Group.findByPk(req.params.group_id);
 
-    if (!group.enabled && !isAuthorized(req)) {
+    if (!group || !group.enabled && !isAuthorized(req)) {
         res.status(404).json({ error: 'Group not found' });
         return;
     }