diff --git a/handle.go b/handle.go
index 7ab6ce6..43b363b 100644
--- a/handle.go
+++ b/handle.go
@@ -67,6 +67,18 @@ func createHttpHandler(handlers Handlers) func(http.ResponseWriter, *http.Reques
 			ctx: ctx,
 		}
 
+		defer func() {
+			if err := recover(); err != nil {
+				sendStatus(ctx, req, Status{
+					State:  Failed,
+					Reason: fmt.Sprintf("Unsuccessfully invoked handler %s/%s@%s", event.Skill.Namespace, event.Skill.Name, name),
+				})
+				w.WriteHeader(201)
+				logger.Errorf("Unhandled error occurred: %v", err)
+				return
+			}
+		}()
+
 		start := time.Now()
 		logger.Debugf("Skill execution started")
 		logger.Debugf("Incoming event message: %s", sanitizeEvent(body))
@@ -79,18 +91,6 @@ func createHttpHandler(handlers Handlers) func(http.ResponseWriter, *http.Reques
 		if handle, ok := handlers[name]; ok {
 			logger.Debugf("Invoking event handler '%s'", name)
 
-			defer func() {
-				if err := recover(); err != nil {
-					sendStatus(ctx, req, Status{
-						State:  Failed,
-						Reason: fmt.Sprintf("Unsuccessfully invoked handler %s/%s@%s", event.Skill.Namespace, event.Skill.Name, name),
-					})
-					w.WriteHeader(201)
-					logger.Errorf("Unhandled error occurred: %v", err)
-					return
-				}
-			}()
-
 			err = sendStatus(ctx, req, Status{
 				State: running,
 			})
diff --git a/log.go b/log.go
index f411ed4..fdbebaf 100644
--- a/log.go
+++ b/log.go
@@ -235,7 +235,14 @@ func sanitizeEvent(incoming string) string {
 		match, _ := regexp.MatchString("(?i)token|password|jwt|url|secret|authorization|key|cert|pass|user|address|email|pat", name)
 		if match {
 			value := incoming[res[i][4]:res[i][5]]
-			newValue := value[0:1] + strings.Repeat("*", len(value)-2) + value[len(value)-1:]
+			var newValue string
+
+			if len(value) < 2 {
+				newValue = "*"
+			} else {
+				newValue = value[0:1] + strings.Repeat("*", len(value)-2) + value[len(value)-1:]
+			}
+
 			incoming = incoming[0:res[i][4]] + newValue + incoming[res[i][5]:]
 		}
 	}
diff --git a/log_test.go b/log_test.go
index 6082352..a3a9f56 100644
--- a/log_test.go
+++ b/log_test.go
@@ -81,3 +81,12 @@ func TestSanitizeEvent(t *testing.T) {
 		t.Errorf("token not sanitized")
 	}
 }
+
+func TestSanitizeEventWithSingleCharacterUser(t *testing.T) {
+	var payload = "{:execution-id \"855f5639-8627-4bf2-86e8-51346019ddcb.iStU3P05jAeiKAJ7pnXfg\", :skill {:namespace \"atomist\", :name \"go-sample-skill\", :version \"0.1.0-100\"}, :workspace-id \"T29E48P34\", :type :subscription, :context {:subscription {:name \"on_push\", :configuration {:name \"go_sample_skill\", :parameters [{:name \"repoFilter\", :value {}} {:name \"on_webhook\", :value ({:name \"on_webhook-0\", :url \"https://webhook.atomist.com/atomist/resource/b36b6db3-7d73-442b-9809-626a9ce036d0\"})}]}, :result ([{:git.commit/repo {:git.repo/name \"go-sample-skill\", :git.repo/source-id \"490643782\", :git.repo/default-branch \"main\", :git.repo/org {:github.org/installation-token \"ghs_H9bCqKtdsdfsfsdfsfsfsfQ8BeD6iWrSGM4RfYZm\", :git.org/name \"atomist-skills\", :git.provider/url \"https://github.com\"}}, :git.commit/author {:git.user/name \"0\", :git.user/login \"atomist[bot]\", :git.user/emails [{:email.email/address \"22779605+atomist[bot]@users.noreply.github.com\"}]}, :git.commit/sha \"8969fcce08a2869affc001a05fd8471bcf92b28f\", :git.commit/message \"Auto-merge pull request #21 from atomist-skills/go-sample-skill\", :git.ref/refs [{:git.ref/name \"main\", :git.ref/type {:db/id 83562883711320, :db/ident :git.ref.type/branch}}]}]), :metadata {:after-basis-t 4354969, :tx 13194143888281}, :after-basis-t 4354969, :tx 13194143888281}}, :urls {:execution \"https://api.atomist.com/executions/855f5639-8627-4bf2-86e8-51346019ddcb.iStU3P05jAeiKAJ7pnXfg\", :logs \"https://api.atomist.com/executions/855f5639-8627-4bf2-86e8-51346019ddcb.iStU3P05jAeiKAJ7pnXfg/logs\", :transactions \"https://api.atomist.com/executions/855f5639-8627-4bf2-86e8-51346019ddcb.iStU3P05jAeiKAJ7pnXfg/transactions\", :query \"https://api.atomist.com/datalog/team/T29E48P34/queries\"}, :token \"eyJhbGciOiJSUzI1NiOGd_6YHE8ud8GsBMy4E\"}"
+	sanitizedEvent := sanitizeEvent(payload)
+
+	if strings.Contains(sanitizedEvent, "\"0\"") {
+		t.Errorf("user not sanitised")
+	}
+}