Fix exceptions in previous commit

src/pretix/presale/utils.py

@@ -97,6 +97,7 @@ def _detect_event(request, require_live=True, require_plugin=None):
                     return response
 
     except Event.DoesNotExist:
+        try:
             if hasattr(request, 'organizer_domain'):
                 event = request.organizer.events.get(
                     slug__iexact=url.kwargs['event'],
@@ -115,15 +116,20 @@ def _detect_event(request, require_live=True, require_plugin=None):
                     pathparts[1] = event.organizer.slug
                     pathparts[2] = event.slug
                     return redirect('/'.join(pathparts))
-            elif 'organizer' in url.kwargs:
+        except Event.DoesNotExist:
+            raise Http404(_('The selected event was not found.'))
+        raise Http404(_('The selected event was not found.'))
+    except Organizer.DoesNotExist:
+        if 'organizer' in url.kwargs:
+            try:
                 organizer = Organizer.objects.get(
                     slug__iexact=url.kwargs['organizer']
                 )
+            except Organizer.DoesNotExist:
+                raise Http404(_('The selected organizer was not found.'))
             pathparts = request.get_full_path().split('/')
             pathparts[1] = organizer.slug
             return redirect('/'.join(pathparts))
-        raise Http404(_('The selected event was not found.'))
-    except Organizer.DoesNotExist:
         raise Http404(_('The selected organizer was not found.'))
 
     request._event_detected = True