diff --git a/hyprpm/src/core/PluginManager.cpp b/hyprpm/src/core/PluginManager.cpp
index 90eba5799..b7316fdb7 100644
--- a/hyprpm/src/core/PluginManager.cpp
+++ b/hyprpm/src/core/PluginManager.cpp
@@ -159,6 +159,11 @@ bool CPluginManager::addNewPluginRepo(const std::string& url, const std::string&
         DataState::updateGlobalState(GLOBALSTATE);
     }
 
+    if (GLOBALSTATE.headersHashCompiled.empty()) {
+        std::println("\n{}", failureString("Cannot find headers in the global state. Try running hyprpm update first."));
+        return false;
+    }
+
     std::cout << Colors::GREEN << "✔" << Colors::RESET << Colors::RED << " adding a new plugin repository " << Colors::RESET << "from " << url << "\n  " << Colors::RED
               << "MAKE SURE" << Colors::RESET << " that you trust the authors. " << Colors::RED << "DO NOT" << Colors::RESET
               << " install random plugins without verifying the code and author.\n  "
diff --git a/src/xwayland/Dnd.cpp b/src/xwayland/Dnd.cpp
index e4c609202..9d2012fb0 100644
--- a/src/xwayland/Dnd.cpp
+++ b/src/xwayland/Dnd.cpp
@@ -286,8 +286,8 @@ void CX11DataDevice::forceCleanupDnd() {
     if (m_lastOffer) {
         auto source = m_lastOffer->getSource();
         if (source) {
-            source->cancelled();
             source->sendDndFinished();
+            source->cancelled();
         }
     }