diff --git a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/RequestInfoImpl.java b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/RequestInfoImpl.java
index a0b6b701be33231559095c13d2b46e1d266a62fe..6ddf941be1f763557bce5904cd290ff22cd34ef8 100644
--- a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/RequestInfoImpl.java
+++ b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/RequestInfoImpl.java
@@ -57,9 +57,9 @@ public class RequestInfoImpl implements IRequestInfo {
     @Value("${DEPLOYMENT_ENVIRONMENT}")
     private String DEPLOYMENT_ENVIRONMENT;
 
-    private static final String INDEXER_QUEUE_KEY="x-api-key";
+    private static final String INDEXER_API_KEY_HEADER="x-api-key";
     
-    @Value("${INDEXER_QUEUE_API_KEY}")
+    @Value("${INDEXER_API_KEY}")
     private String tokenFromProperty;
 
     @Override
@@ -71,12 +71,14 @@ public class RequestInfoImpl implements IRequestInfo {
         }
 		DpsHeaders headers = this.getCoreServiceHeaders(headersMap.getHeaders());
 
-		if (headers.getHeaders().containsKey(INDEXER_QUEUE_KEY)) {
-			String apiToken = headers.getHeaders().get(INDEXER_QUEUE_KEY);
-			if (!apiToken.equalsIgnoreCase(tokenFromProperty)) {
-				logger.error("Token in header is mismatched");
-				throw new AppException(HttpStatus.SC_UNAUTHORIZED, "Token in header mismatched.", "Token in header mismatched.");
+		if (headers.getHeaders().containsKey(INDEXER_API_KEY_HEADER)) {
+			String apiToken = headers.getHeaders().get(INDEXER_API_KEY_HEADER);
+			if (!apiToken.equals(tokenFromProperty)) {
+				logger.error("Indexer API Token in header is mismatched");
+				throw new AppException(HttpStatus.SC_UNAUTHORIZED, "Indexer API Token in header mismatched.", "Indexer API Token in header mismatched.");
 			}
+		} else {
+			throw new AppException(HttpStatus.SC_INTERNAL_SERVER_ERROR, "Missing Header", "The headers "+ INDEXER_API_KEY_HEADER + "  is missing!");
 		}
 		return headers;
 	}
@@ -107,7 +109,7 @@ public class RequestInfoImpl implements IRequestInfo {
 
     @Override
     public boolean isTaskQueueRequest() {
-        //if (!this.dpsHeaders.getHeaders().containsKey(INDEXER_QUEUE_KEY)) return false;
+        //if (!this.dpsHeaders.getHeaders().containsKey(INDEXER_API_KEY_HEADER)) return false;
     	
 
 //        String queueId = this.headersInfo.getHeadersMap().get(AppEngineHeaders.TASK_QUEUE_NAME);
diff --git a/provider/indexer-ibm/src/main/resources/application.properties b/provider/indexer-ibm/src/main/resources/application.properties
index b532a9b624efa59f7e0c6d6f3391b7d7a12a1fb1..701f7c8469bb6482eb765eef9d2a948971fb5c4e 100644
--- a/provider/indexer-ibm/src/main/resources/application.properties
+++ b/provider/indexer-ibm/src/main/resources/application.properties
@@ -68,4 +68,4 @@ ELASTIC_USER_PASSWORD=REPLACE_ME:REPLACE_ME
 #requeue logic
 INDEXER_QUEUE_HOST=""
 ibm.env.prefix=oc-local
-INDEXER_QUEUE_API_KEY=abcds
\ No newline at end of file
+INDEXER_API_KEY=abcds