diff --git a/src/CameraController.hx b/src/CameraController.hx
index f123ae1a..40df4407 100644
--- a/src/CameraController.hx
+++ b/src/CameraController.hx
@@ -210,7 +210,7 @@ class CameraController extends Object {
 		var cameraPitchDelta = (Key.isDown(Settings.controlsSettings.camBackward) ? 1 : 0)
 			- (Key.isDown(Settings.controlsSettings.camForward) ? 1 : 0)
 			+ gamepadY;
-		if (Settings.gamepadSettings.invertYAxis)
+		if (Settings.gamepadSettings.invertYAxis || Settings.controlsSettings.invertYAxis)
 			cameraPitchDelta = -cameraPitchDelta;
 		var cameraYawDelta = (Key.isDown(Settings.controlsSettings.camRight) ? 1 : 0) - (Key.isDown(Settings.controlsSettings.camLeft) ? 1 : 0) + gamepadX;
 		if (Settings.gamepadSettings.invertXAxis)
diff --git a/src/net/Net.hx b/src/net/Net.hx
index d8f5333b..da4ff059 100644
--- a/src/net/Net.hx
+++ b/src/net/Net.hx
@@ -279,9 +279,11 @@ class Net {
 			var onDatachannelOpen = (idx:Int) -> {
 				openFlags |= idx;
 				if (openFlags == 3) {
-					var loadGui:MultiplayerLoadingGui = cast MarbleGame.canvas.content;
-					if (loadGui != null) {
-						loadGui.setLoadingStatus("Handshaking");
+					if (MarbleGame.canvas.content is MultiplayerLoadingGui) {
+						var loadGui:MultiplayerLoadingGui = cast MarbleGame.canvas.content;
+						if (loadGui != null) {
+							loadGui.setLoadingStatus("Handshaking");
+						}
 					}
 					Console.log("Successfully connected!");
 					clients.set(client, new ClientConnection(0, client, clientDatachannel, clientDatachannelUnreliable)); // host is always 0