diff --git a/src/pretix/control/middleware.py b/src/pretix/control/middleware.py
index bd58d285b9..d7b36b121f 100644
--- a/src/pretix/control/middleware.py
+++ b/src/pretix/control/middleware.py
@@ -70,5 +70,5 @@ class PermissionMiddleware:
                     permitted__id__exact=request.user.id,
                 )[0]
             except IndexError:
-                return Http404(_("The selected organizer was not found or you "
-                                 "have no permission to administrate it."))
+                raise Http404(_("The selected organizer was not found or you "
+                                "have no permission to administrate it."))
diff --git a/src/pretix/control/views/orders.py b/src/pretix/control/views/orders.py
index 490108adbe..7fbb9d2d10 100644
--- a/src/pretix/control/views/orders.py
+++ b/src/pretix/control/views/orders.py
@@ -231,7 +231,7 @@ class OrderDownload(OrderView):
             ct.cachedfile = cf
         ct.save()
         generate(self.order.identity, self.output.identifier)
-        return redirect(reverse('presale:cachedfile.download', kwargs={'id': ct.cachedfile.id}))
+        return redirect(reverse('cachedfile.download', kwargs={'id': ct.cachedfile.id}))
 
 
 class OrderExtend(OrderView):
diff --git a/src/pretix/presale/middleware.py b/src/pretix/presale/middleware.py
index 70685e46c1..219c9f6146 100644
--- a/src/pretix/presale/middleware.py
+++ b/src/pretix/presale/middleware.py
@@ -31,4 +31,4 @@ class EventMiddleware:
                     organizer__slug=url.kwargs['organizer'],
                 ).select_related('organizer')[0]
             except IndexError:
-                return Http404(_('The selected event was not found.'))
+                raise Http404(_('The selected event was not found.'))
diff --git a/src/pretix/presale/views/order.py b/src/pretix/presale/views/order.py
index 20b581e292..41f15f1ab6 100644
--- a/src/pretix/presale/views/order.py
+++ b/src/pretix/presale/views/order.py
@@ -290,4 +290,4 @@ class OrderDownload(EventViewMixin, OrderDetailMixin, View):
             ct.cachedfile = cf
         ct.save()
         generate(self.order.identity, self.output.identifier)
-        return redirect(reverse('presale:cachedfile.download', kwargs={'id': ct.cachedfile.id}))
+        return redirect(reverse('cachedfile.download', kwargs={'id': ct.cachedfile.id}))