diff --git a/plugins/builtin/source/content/background_services.cpp b/plugins/builtin/source/content/background_services.cpp
index 27a5761de..44cd96e79 100644
--- a/plugins/builtin/source/content/background_services.cpp
+++ b/plugins/builtin/source/content/background_services.cpp
@@ -28,13 +28,17 @@ namespace hex::plugin::builtin {
 
                    const auto &endpoints = ContentRegistry::CommunicationInterface::impl::getNetworkEndpoints();
                    if (auto callback = endpoints.find(json["endpoint"].get<std::string>()); callback != endpoints.end()) {
+                       log::info("Network endpoint {} called with arguments '{}'", json["endpoint"].get<std::string>(), json.contains("data") ? json["data"].dump() : "");
+
                        auto responseData = callback->second(json.contains("data") ? json["data"] : nlohmann::json::object());
 
                        result["status"] = "success";
                        result["data"] = responseData;
+                   } else {
+                       throw std::runtime_error("Endpoint not found");
                    }
                 } catch (const std::exception &e) {
-                    log::error("Network interface service error: {}", e.what());
+                    log::warn("Network interface service error: {}", e.what());
 
                     result["status"] = "error";
                     result["data"]["error"] = e.what();
diff --git a/plugins/builtin/source/content/communication_interface.cpp b/plugins/builtin/source/content/communication_interface.cpp
index b24235c66..365461203 100644
--- a/plugins/builtin/source/content/communication_interface.cpp
+++ b/plugins/builtin/source/content/communication_interface.cpp
@@ -6,7 +6,7 @@ namespace hex::plugin::builtin {
 
     void registerNetworkEndpoints() {
         ContentRegistry::CommunicationInterface::registerNetworkEndpoint("pattern_editor/set_code", [](const nlohmann::json &data) -> nlohmann::json {
-            auto code = data["code"].get<std::string>();
+            auto code = data.at("code").get<std::string>();
 
             EventManager::post<RequestSetPatternLanguageCode>(code);