diff --git a/interface/src/ui/OAuthWebViewHandler.cpp b/interface/src/ui/OAuthWebViewHandler.cpp
index 3b9cf9f125..6ef7bebdce 100644
--- a/interface/src/ui/OAuthWebViewHandler.cpp
+++ b/interface/src/ui/OAuthWebViewHandler.cpp
@@ -40,8 +40,11 @@ void OAuthWebViewHandler::addHighFidelityRootCAToSSLConfig() {
 
 void OAuthWebViewHandler::displayWebviewForAuthorizationURL(const QUrl& authorizationURL) {
     if (!_activeWebView) {
-        _activeWebView = new QWebView();
+        _activeWebView = new QWebView;
+        
+        // keep the window on top and delete it when it closes
         _activeWebView->setWindowFlags(Qt::WindowStaysOnTopHint);
+        _activeWebView->setAttribute(Qt::WA_DeleteOnClose);
         
         qDebug() << "Displaying QWebView for OAuth authorization at" << authorizationURL.toString();
         _activeWebView->load(authorizationURL);
diff --git a/interface/src/ui/OAuthWebViewHandler.h b/interface/src/ui/OAuthWebViewHandler.h
index e411bda579..692a31dc75 100644
--- a/interface/src/ui/OAuthWebViewHandler.h
+++ b/interface/src/ui/OAuthWebViewHandler.h
@@ -29,7 +29,7 @@ public slots:
 private slots:
     void handleSSLErrors(QNetworkReply* networkReply, const QList<QSslError>& errorList);
 private:
-    QWebView* _activeWebView;
+    QPointer<QWebView> _activeWebView;
 };
 
 #endif // hifi_OAuthWebviewHandler_h
\ No newline at end of file
diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp
index fbf2655269..9714bf11e5 100644
--- a/libraries/networking/src/NodeList.cpp
+++ b/libraries/networking/src/NodeList.cpp
@@ -404,7 +404,6 @@ void NodeList::sendDomainServerCheckIn() {
             dtlsSession->writeDatagram(domainServerPacket);
         }
         
-        
         const int NUM_DOMAIN_SERVER_CHECKINS_PER_STUN_REQUEST = 5;
         static unsigned int numDomainCheckins = 0;
         
@@ -413,14 +412,16 @@ void NodeList::sendDomainServerCheckIn() {
             sendSTUNRequest();
         }
         
-        if (_numNoReplyDomainCheckIns >= MAX_SILENT_DOMAIN_SERVER_CHECK_INS) {
-            // we haven't heard back from DS in MAX_SILENT_DOMAIN_SERVER_CHECK_INS
-            // so emit our signal that indicates that
-            emit limitOfSilentDomainCheckInsReached();
+        if (_domainHandler.isConnected()) {
+            if (_numNoReplyDomainCheckIns >= MAX_SILENT_DOMAIN_SERVER_CHECK_INS) {
+                // we haven't heard back from DS in MAX_SILENT_DOMAIN_SERVER_CHECK_INS
+                // so emit our signal that indicates that
+                emit limitOfSilentDomainCheckInsReached();
+            }
+            
+            // increment the count of un-replied check-ins
+            _numNoReplyDomainCheckIns++;
         }
-        
-        // increment the count of un-replied check-ins
-        _numNoReplyDomainCheckIns++;
     }
 }