1 files changed, 15 insertions, 15 deletions

diff --git a/modules/controlcenter/network/NetworkingPane.qml b/modules/controlcenter/network/NetworkingPane.qml
index b430cce..9047174 100644
--- a/modules/controlcenter/network/NetworkingPane.qml
+++ b/modules/controlcenter/network/NetworkingPane.qml
@@ -153,9 +153,9 @@ Item {
         rightContent: Component {
             Item {
                 id: rightPaneItem
-                
-                property var ethernetPane: root.session.ethernet.active
-                property var wirelessPane: root.session.network.active
+
+                property var ethernetPane: root.session && root.session.ethernet ? root.session.ethernet.active : null
+                property var wirelessPane: root.session && root.session.network ? root.session.network.active : null
                 property var pane: ethernetPane || wirelessPane
                 property string paneId: ethernetPane ? ("eth:" + (ethernetPane.interface || "")) : (wirelessPane ? ("wifi:" + (wirelessPane.ssid || wirelessPane.bssid || "")) : "settings")
                 property Component targetComponent: settingsComponent
@@ -173,28 +173,28 @@ Item {
                 }
 
                 Connections {
-                    target: root.session.ethernet
+                    target: root.session && root.session.ethernet ? root.session.ethernet : null
+                    enabled: target !== null
+
                     function onActiveChanged() {
-                        // Clear wireless when ethernet is selected
-                        if (root.session.ethernet.active && root.session.network.active) {
-                            root.session.network.active = null;
-                            return; // Let the network.onActiveChanged handle the update
+                        // Clear others when ethernet is selected
+                        if (root.session && root.session.ethernet && root.session.ethernet.active) {
+                            if (root.session.network && root.session.network.active) root.session.network.active = null;
                         }
                         rightPaneItem.nextComponent = rightPaneItem.getComponentForPane();
-                        // paneId will automatically update via property binding
                     }
                 }
 
                 Connections {
-                    target: root.session.network
+                    target: root.session && root.session.network ? root.session.network : null
+                    enabled: target !== null
+
                     function onActiveChanged() {
-                        // Clear ethernet when wireless is selected
-                        if (root.session.network.active && root.session.ethernet.active) {
-                            root.session.ethernet.active = null;
-                            return; // Let the ethernet.onActiveChanged handle the update
+                        // Clear others when wireless is selected
+                        if (root.session && root.session.network && root.session.network.active) {
+                            if (root.session.ethernet && root.session.ethernet.active) root.session.ethernet.active = null;
                         }
                         rightPaneItem.nextComponent = rightPaneItem.getComponentForPane();
-                        // paneId will automatically update via property binding
                     }
                 }