diff --git a/src/main/java/com/adyen/examples/controller/WebhookController.java b/src/main/java/com/adyen/examples/controller/WebhookController.java
index 3724f3b..d4b8fcd 100644
--- a/src/main/java/com/adyen/examples/controller/WebhookController.java
+++ b/src/main/java/com/adyen/examples/controller/WebhookController.java
@@ -17,6 +17,7 @@
  */
 
 @RestController
+@CrossOrigin
 @RequestMapping("/api")
 public class WebhookController {
     private final Logger logger = LoggerFactory.getLogger(WebhookController.class);
@@ -49,7 +50,7 @@ public ResponseEntity<String> webhooks(@RequestHeader Map<String, String> header
 
         String hmacsignature = headers.get("hmacsignature");
 
-        if (hmacsignature.isBlank()) {
+        if (hmacsignature == null || hmacsignature.isBlank()) {
             logger.warn("HMAC Signature not found");
             throw new RuntimeException("HMAC Signature not found");
         }
@@ -61,7 +62,7 @@ public ResponseEntity<String> webhooks(@RequestHeader Map<String, String> header
 
         // process AccountHolder webhook
         AccountHolderNotificationRequest accountHolderNotificationRequest = eventHandler.getAccountHolderNotificationRequest(json);
-        logger.info("environment--->{}", accountHolderNotificationRequest.getEnvironment());
+        logger.info("type--->{}", accountHolderNotificationRequest.getType());
 
         // Acknowledge event has been consumed
         return ResponseEntity.ok().body("[accepted]");