diff --git a/internal/token/mint.go b/internal/token/mint.go
index 155a4272b..dc36b7264 100644
--- a/internal/token/mint.go
+++ b/internal/token/mint.go
@@ -134,6 +134,7 @@ func (tm *Manager) MintToken(mto *MintTokenOpts) (string, error) {
 func (tm *Manager) MintIDToken(ctx context.Context, mto *MintTokenOpts, db database.Interface) (string, error) {
 	// initialize claims struct
 	var claims = new(api.OpenIDClaims)
+
 	var err error
 
 	// validate provided claims
@@ -168,6 +169,9 @@ func (tm *Manager) MintIDToken(ctx context.Context, mto *MintTokenOpts, db datab
 	claims.TokenType = mto.TokenType
 	claims.Image = mto.Image
 	claims.ImageName, claims.ImageTag, err = imageParse(mto.Image)
+	if err != nil {
+		return "", err
+	}
 	claims.Request = mto.Request
 	claims.Commands = mto.Commands
 
diff --git a/internal/token/mint_test.go b/internal/token/mint_test.go
index 6c59b80a8..7ec01bc34 100644
--- a/internal/token/mint_test.go
+++ b/internal/token/mint_test.go
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 package token
 
 import "testing"