diff --git a/js/ui/components/networkAgent.js b/js/ui/components/networkAgent.js
index d1c984643..e214cd87c 100644
--- a/js/ui/components/networkAgent.js
+++ b/js/ui/components/networkAgent.js
@@ -613,7 +613,8 @@ const NetworkAgent = new Lang.Class({
         this._vpnRequests = { };
 
         this._native.auto_register = false;
-        this._native.unregister();
+        if (this._native.registered)
+            this._native.unregister();
     },
 
     _newRequest:  function(agent, requestId, connection, settingName, hints, flags) {