diff --git a/pkg/routes/api/v1/user_caldav_token.go b/pkg/routes/api/v1/user_caldav_token.go
index 85ab78df4..fd7b29568 100644
--- a/pkg/routes/api/v1/user_caldav_token.go
+++ b/pkg/routes/api/v1/user_caldav_token.go
@@ -17,10 +17,11 @@
 package v1
 
 import (
+	"net/http"
+
 	"code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/web/handler"
 	"github.com/labstack/echo/v4"
-	"net/http"
 )
 
 type TokenResponse struct {
diff --git a/pkg/user/token.go b/pkg/user/token.go
index c7d9a277c..341dc3cbb 100644
--- a/pkg/user/token.go
+++ b/pkg/user/token.go
@@ -73,6 +73,9 @@ func generateHashedToken(s *xorm.Session, u *User, kind TokenKind) (token *Token
 	token = genToken(u, kind)
 	token.ClearTextToken = token.Token
 	token.Token, err = HashPassword(token.ClearTextToken)
+	if err != nil {
+		return nil, err
+	}
 
 	_, err = s.Insert(token)
 	return