diff --git a/echo-webhooks/src/main/groovy/com/netflix/spinnaker/echo/scm/BitbucketWehbookEventHandler.java b/echo-webhooks/src/main/groovy/com/netflix/spinnaker/echo/scm/BitbucketWehbookEventHandler.java
index 9002b7c03..5e6a6cc17 100644
--- a/echo-webhooks/src/main/groovy/com/netflix/spinnaker/echo/scm/BitbucketWehbookEventHandler.java
+++ b/echo-webhooks/src/main/groovy/com/netflix/spinnaker/echo/scm/BitbucketWehbookEventHandler.java
@@ -66,6 +66,12 @@ public void handle(Event event, Map postedEvent) {
       handleBitbucketCloudEvent(event, postedEvent);
     } else if (looksLikeBitbucketServer(event)) {
       handleBitbucketServerEvent(event, postedEvent);
+    } else {
+      // Could not determine what type of Bitbucket event this was.
+      log.info(
+          "Could not determine Bitbucket type {}",
+          kv("event_type", event.content.get("event_type")));
+      return;
     }
 
     String fullRepoName = getFullRepoName(event);
@@ -98,7 +104,9 @@ public void handle(Event event, Map postedEvent) {
               event.content.containsKey("request_id")
                   ? event.content.get("request_id").toString()
                   : ""),
-          kv("branch", event.content.get("branch").toString()));
+          kv(
+              "branch",
+              event.content.containsKey("branch") ? event.content.get("branch").toString() : ""));
     }
   }