diff --git a/protocol/connections/engine_token_handler.go b/protocol/connections/engine_token_handler.go
index 2f3d5ec..604f3b0 100644
--- a/protocol/connections/engine_token_handler.go
+++ b/protocol/connections/engine_token_handler.go
@@ -41,6 +41,7 @@ func (e *engine) NewTokenHandler(tokenService string, tokens []*privacypass.Toke
 func (e *engine) FetchToken(tokenService string) (*privacypass.Token, int, error) {
 	tokenManagerPointer, _ := e.tokenManagers.LoadOrStore(tokenService, new(TokenManager))
 	tokenManager := tokenManagerPointer.(*TokenManager)
-	e.eventManager.Publish(event.NewEvent(event.TokenManagerInfo, map[event.Field]string{event.ServerTokenOnion: tokenService, event.ServerTokenCount: strconv.Itoa(tokenManager.NumTokens())}))
-	return tokenManager.FetchToken()
+	token, numTokens, err := tokenManager.FetchToken()
+	e.eventManager.Publish(event.NewEvent(event.TokenManagerInfo, map[event.Field]string{event.ServerTokenOnion: tokenService, event.ServerTokenCount: strconv.Itoa(numTokens)}))
+	return token, numTokens, err
 }