diff --git a/backend/controllers/calls.js b/backend/controllers/calls.js
index 15f8c27..42db31d 100644
--- a/backend/controllers/calls.js
+++ b/backend/controllers/calls.js
@@ -104,13 +104,14 @@ async function build_filter(filter_type, code, start_time, direction, shortName,
             }
 
             const group = await Group.findOne({ 'shortName': shortName, '_id': ObjectId.createFromHexString(code) }).exec();
-            if (!group) {
+            if (!group || !group.talkgroups) {
                 console.warn("[" + shortName + "] Error - build_filter() group is null ");
                 res.contentType('json');
                 res.status(404);
                 res.send(JSON.stringify({
                     message: 'That Group ID doesnt exist.'
                 }));
+                return;
             }
             filter.talkgroupNum = {
                 $in: group.talkgroups