2 files changed, 4 insertions, 1 deletions

diff --git a/sway/tree/container.c b/sway/tree/container.c
index 9358dad7..933907f4 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -831,7 +831,7 @@ void container_floating_move_to(struct sway_container *con,
         }
         struct sway_workspace *new_workspace =
                 output_get_active_workspace(new_output);
-        if (old_workspace != new_workspace) {
+        if (new_workspace && old_workspace != new_workspace) {
                 container_detach(con);
                 workspace_add_floating(new_workspace, con);
                 arrange_workspace(old_workspace);
diff --git a/sway/tree/output.c b/sway/tree/output.c
index 146bc423..e0a66e0b 100644
--- a/sway/tree/output.c
+++ b/sway/tree/output.c
@@ -143,6 +143,9 @@ void output_enable(struct sway_output *output, struct output_config *oc) {
 static void evacuate_sticky(struct sway_workspace *old_ws,
                 struct sway_output *new_output) {
         struct sway_workspace *new_ws = output_get_active_workspace(new_output);
+        if (!sway_assert(new_ws, "New output does not have a workspace")) {
+                return;
+        }
         while (old_ws->floating->length) {
                 struct sway_container *sticky = old_ws->floating->items[0];
                 container_detach(sticky);