diff --git a/apps/output/views.py b/apps/output/views.py
index 327311d8..faab1a24 100644
--- a/apps/output/views.py
+++ b/apps/output/views.py
@@ -129,14 +129,22 @@ def generate_m3u(request, profile_name=None, user=None):
 
     else:
         if profile_name is not None:
-            channel_profile = ChannelProfile.objects.get(name=profile_name)
+            try:
+                channel_profile = ChannelProfile.objects.get(name=profile_name)
+            except ChannelProfile.DoesNotExist:
+                logger.warning("Requested channel profile (%s) during m3u generation does not exist", profile_name)
+                raise Http404(f"Channel profile '{profile_name}' not found")
             channels = Channel.objects.filter(
                 channelprofilemembership__channel_profile=channel_profile,
                 channelprofilemembership__enabled=True
             ).order_by('channel_number')
         else:
             if profile_name is not None:
-                channel_profile = ChannelProfile.objects.get(name=profile_name)
+                try:
+                    channel_profile = ChannelProfile.objects.get(name=profile_name)
+                except ChannelProfile.DoesNotExist:
+                    logger.warning("Requested channel profile (%s) during m3u generation does not exist", profile_name)
+                    raise Http404(f"Channel profile '{profile_name}' not found")
                 channels = Channel.objects.filter(
                     channelprofilemembership__channel_profile=channel_profile,
                     channelprofilemembership__enabled=True,
@@ -1242,7 +1250,11 @@ def generate_epg(request, profile_name=None, user=None):
                 )
         else:
             if profile_name is not None:
-                channel_profile = ChannelProfile.objects.get(name=profile_name)
+                try:
+                    channel_profile = ChannelProfile.objects.get(name=profile_name)
+                except ChannelProfile.DoesNotExist:
+                    logger.warning("Requested channel profile (%s) during epg generation does not exist", profile_name)
+                    raise Http404(f"Channel profile '{profile_name}' not found")
                 channels = Channel.objects.filter(
                     channelprofilemembership__channel_profile=channel_profile,
                     channelprofilemembership__enabled=True,