diff --git a/pom.xml b/pom.xml
index 231ab69..02913fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>hapi-fhir</artifactId>
-            <version>6.9.8-SNAPSHOT</version>
+            <version>6.9.9-SNAPSHOT</version>
     </parent>
 
     <artifactId>hapi-fhir-jpaserver-starter</artifactId>
diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/CdsHooksServlet.java b/src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/CdsHooksServlet.java
index 77cc7e9..8f32e82 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/CdsHooksServlet.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/cdshooks/CdsHooksServlet.java
@@ -46,7 +46,7 @@ public class CdsHooksServlet extends HttpServlet {
 
 	// CORS Pre-flight
 	@Override
-	protected void doOptions(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+	protected void doOptions(HttpServletRequest req, HttpServletResponse resp) {
 		ErrorHandling.setAccessControlHeaders(resp, appProperties);
 		resp.setHeader("Content-Type", ContentType.APPLICATION_JSON.getMimeType());
 		resp.setHeader("X-Content-Type-Options", "nosniff");
@@ -64,7 +64,8 @@ public class CdsHooksServlet extends HttpServlet {
 		}
 		ErrorHandling.setAccessControlHeaders(response, appProperties);
 		response.setHeader("Content-Type", ContentType.APPLICATION_JSON.getMimeType());
-		response.getWriter().println(new GsonBuilder().setPrettyPrinting().create().toJson(getServices()));
+		response.getWriter().println(new GsonBuilder().setPrettyPrinting().create().toJson(
+			JsonParser.parseString(objectMapper.writeValueAsString(getServices()))));
 	}
 
 	@Override