From aab90e75da469a326a6547a96bfba92055bca86b Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@libreserver.org>
Date: Wed, 23 Mar 2022 22:49:37 +0000
Subject: [PATCH] Check for no domain

---
 daemon.py                | 15 +++++++++------
 webapp_person_options.py |  2 ++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/daemon.py b/daemon.py
index 1c3d22acb..6c09e26cc 100644
--- a/daemon.py
+++ b/daemon.py
@@ -7765,12 +7765,15 @@ class PubServer(BaseHTTPRequestHandler):
                                     self.server.news_instance,
                                     authorized,
                                     access_keys, is_group).encode('utf-8')
-            msglen = len(msg)
-            self._set_headers('text/html', msglen,
-                              cookie, calling_domain, False)
-            self._write(msg)
-            fitness_performance(getreq_start_time, self.server.fitness,
-                                '_GET', '_show_person_options', debug)
+            if msg:
+                msglen = len(msg)
+                self._set_headers('text/html', msglen,
+                                  cookie, calling_domain, False)
+                self._write(msg)
+                fitness_performance(getreq_start_time, self.server.fitness,
+                                    '_GET', '_show_person_options', debug)
+            else:
+                self._404()
             return
 
         if '/users/news/' in path:
diff --git a/webapp_person_options.py b/webapp_person_options.py
index 9c2797b55..4a78d3a5d 100644
--- a/webapp_person_options.py
+++ b/webapp_person_options.py
@@ -66,6 +66,8 @@ def html_person_options(default_timeline: str,
     """Show options for a person: view/follow/block/report
     """
     options_domain, options_port = get_domain_from_actor(options_actor)
+    if not options_domain:
+        return None
     options_domain_full = get_full_domain(options_domain, options_port)
 
     if os.path.isfile(base_dir + '/accounts/options-background-custom.jpg'):