2 files changed, 7 insertions, 1 deletions
diff --git a/Userland/Services/RequestServer/Protocol.cpp b/Userland/Services/RequestServer/Protocol.cpp
index 19f9fdb1f4..2db08d9685 100644
--- a/Userland/Services/RequestServer/Protocol.cpp
+++ b/Userland/Services/RequestServer/Protocol.cpp
@@ -31,6 +31,7 @@ Protocol::Protocol(const String& name)
 
 Protocol::~Protocol()
 {
+    // FIXME: Do proper de-registration.
     VERIFY_NOT_REACHED();
 }
 
diff --git a/Userland/Services/RequestServer/main.cpp b/Userland/Services/RequestServer/main.cpp
index e3fea3fb0d..8b3385ea73 100644
--- a/Userland/Services/RequestServer/main.cpp
+++ b/Userland/Services/RequestServer/main.cpp
@@ -46,5 +46,10 @@ int main(int, char**)
     auto socket = Core::LocalSocket::take_over_accepted_socket_from_system_server();
     VERIFY(socket);
     IPC::new_client_connection<RequestServer::ClientConnection>(socket.release_nonnull(), 1);
-    return event_loop.exec();
+    auto result = event_loop.exec();
+
+    // FIXME: We exit instead of returning, so that protocol destructors don't get called.
+    //        The Protocol base class should probably do proper de-registration instead of
+    //        just VERIFY_NOT_REACHED().
+    exit(result);
 }