2 files changed, 5 insertions, 2 deletions
diff --git a/src/debug/HyprCtl.cpp b/src/debug/HyprCtl.cpp
index cd91955e..61311c89 100644
--- a/src/debug/HyprCtl.cpp
+++ b/src/debug/HyprCtl.cpp
@@ -169,12 +169,12 @@ R"#({
         "id": %i,
         "name": "%s"
     },
-    "floating": %s,
+    "floating": %i,
     "monitor": %i,
     "class": "%s",
     "title": "%s",
     "pid": %i,
-    "xwayland": %s
+    "xwayland": %i
 })#",
             PWINDOW,
             (int)PWINDOW->m_vRealPosition.vec().x, (int)PWINDOW->m_vRealPosition.vec().y,
diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp
index d86afc2a..987e4309 100644
--- a/src/managers/KeybindManager.cpp
+++ b/src/managers/KeybindManager.cpp
@@ -736,6 +736,9 @@ void CKeybindManager::moveFocusTo(std::string args) {
 
     const auto PLASTWINDOW = g_pCompositor->m_pLastWindow;
 
+    if (!PLASTWINDOW)
+        return;
+
     // remove constraints
     g_pCompositor->m_sSeat.mouse->constraintActive = false;