From 720f8ecae8be56f5f3261e4a048bf0e1fed87239 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 3 Oct 2014 09:08:27 -0700
Subject: [PATCH] handle case where access_token is empty

---
 domain-server/src/DomainServer.cpp    | 2 +-
 libraries/networking/src/NodeList.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 2f74159e25..d3a08f7eb7 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -258,7 +258,7 @@ bool DomainServer::didSetupAccountManagerWithAccessToken() {
         if (accessToken.isEmpty()) {
             const QVariant* accessTokenVariant = valueForKeyPath(_settingsManager.getSettingsMap(), ACCESS_TOKEN_KEY_PATH);
             
-            if (accessTokenVariant->canConvert(QMetaType::QString)) {
+            if (accessTokenVariant && accessTokenVariant->canConvert(QMetaType::QString)) {
                 accessToken = accessTokenVariant->toString();
             } else {
                 qDebug() << "A domain-server feature that requires authentication is enabled but no access token is present."
diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp
index de586f3d36..7b925fa464 100644
--- a/libraries/networking/src/NodeList.cpp
+++ b/libraries/networking/src/NodeList.cpp
@@ -336,7 +336,7 @@ void NodeList::sendDomainServerCheckIn() {
 
 void NodeList::handleICEConnectionToDomainServer() {
     if (_domainHandler.getICEPeer().isNull()) {
-        LimitedNodeList::sendHeartbeatToIceServer(_domainHandler.getICEServerSockAddr(),
+        LimitedNodeList::sendHeartbeatToIceServer(HifiSockAddr("h.dfu.co", 7337),
                                                   _domainHandler.getICEClientID(),
                                                   _domainHandler.getUUID());
     } else {