diff --git a/nnd-data-poll-service/src/main/java/gov/cdc/nnddatapollservice/service/TokenService.java b/nnd-data-poll-service/src/main/java/gov/cdc/nnddatapollservice/service/TokenService.java
index 2adf64ad..57b5c551 100644
--- a/nnd-data-poll-service/src/main/java/gov/cdc/nnddatapollservice/service/TokenService.java
+++ b/nnd-data-poll-service/src/main/java/gov/cdc/nnddatapollservice/service/TokenService.java
@@ -1,6 +1,9 @@
 package gov.cdc.nnddatapollservice.service;
 
 import gov.cdc.nnddatapollservice.service.interfaces.ITokenService;
+import gov.cdc.nnddatapollservice.share.PollServiceUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -11,6 +14,9 @@
 
 @Service
 public class TokenService implements ITokenService {
+    private static Logger logger = LoggerFactory.getLogger(TokenService.class);
+
+
     @Value("${data_exchange.endpoint_token}")
     private String tokenEndpoint;
 
@@ -32,14 +38,22 @@ public String getToken() {
     }
 
     private String fetchNewToken() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("clientid", clientId);
-        headers.add("clientsecret", clientSecret);
-        HttpEntity<String> entity = new HttpEntity<>(headers);
-
-        ResponseEntity<String> response = restTemplate.postForEntity(tokenEndpoint, entity, String.class);
-        if (response.getStatusCode() != HttpStatus.OK) {
+        ResponseEntity<String> response = null;
+        try {
+            HttpHeaders headers = new HttpHeaders();
+            headers.add("clientid", clientId);
+            headers.add("clientsecret", clientSecret);
+            HttpEntity<String> entity = new HttpEntity<>(headers);
+
+            response = restTemplate.postForEntity(tokenEndpoint, entity, String.class);
+            if (response.getStatusCode() != HttpStatus.OK) {
+                System.exit(0);
+            }
+        } catch (Exception e) {
+            logger.error(e.getMessage());
             System.exit(0);
         }
-        return response.getBody();    }
+        return response.getBody();
+
+    }
 }