diff --git a/modules/you_done_it/client_node.cpp b/modules/you_done_it/client_node.cpp
index 64516447..d131f88b 100644
--- a/modules/you_done_it/client_node.cpp
+++ b/modules/you_done_it/client_node.cpp
@@ -13,6 +13,8 @@ void ClientNode::enter_tree() {
 	if (singleton_instance) {
 		print_error("Attempt to create duplicate ClientNode, aborting");
 		abort();
+	} else {
+		singleton_instance = this;
 	}
 }
 
diff --git a/modules/you_done_it/server_node.cpp b/modules/you_done_it/server_node.cpp
index f56fbf65..02a16de7 100644
--- a/modules/you_done_it/server_node.cpp
+++ b/modules/you_done_it/server_node.cpp
@@ -17,9 +17,10 @@ void ServerNode::enter_tree() {
 	if (singleton_instance) {
 		print_error("Attempt to create duplicate ServerNode, aborting");
 		abort();
+	} else {
+		singleton_instance = this;
+		ydi::server::open();
 	}
-	singleton_instance = this;
-	ydi::server::open();
 }
 
 void ServerNode::process(double delta) {