diff --git a/router/cmd/main.go b/router/cmd/main.go
index 44f027b443..e3c5eb0468 100644
--- a/router/cmd/main.go
+++ b/router/cmd/main.go
@@ -44,12 +44,12 @@ func Main() {
 
 	result, err := config.LoadConfig(*configPathFlag, *overrideEnvFlag)
 	if err != nil {
-		log.Fatal("Could not load config", zap.Error(err))
+		log.Fatalf("Could not load config: %s", err)
 	}
 
 	logLevel, err := logging.ZapLogLevelFromString(result.Config.LogLevel)
 	if err != nil {
-		log.Fatal("Could not parse log level", zap.Error(err))
+		log.Fatalf("Could not parse log level: %s", err)
 	}
 
 	logger := logging.New(!result.Config.JSONLog, result.Config.DevelopmentMode, logLevel).
diff --git a/router/core/graph_server.go b/router/core/graph_server.go
index 427aeaf7f7..7195b7b524 100644
--- a/router/core/graph_server.go
+++ b/router/core/graph_server.go
@@ -919,6 +919,11 @@ func (s *graphServer) buildGraphMux(ctx context.Context,
 	operationPlanner := NewOperationPlanner(executor, gm.planCache)
 
 	if s.Config.cacheWarmup != nil && s.Config.cacheWarmup.Enabled {
+
+		if s.graphApiToken == "" {
+			return nil, fmt.Errorf("graph token is required for cache warmup in order to communicate with the CDN")
+		}
+
 		processor := NewCacheWarmupPlanningProcessor(&CacheWarmupPlanningProcessorOptions{
 			OperationProcessor: operationProcessor,
 			OperationPlanner:   operationPlanner,
diff --git a/router/internal/jwt/claims.go b/router/internal/jwt/claims.go
index 5d91c6c89e..b6b60f832b 100644
--- a/router/internal/jwt/claims.go
+++ b/router/internal/jwt/claims.go
@@ -21,7 +21,7 @@ func ExtractFederatedGraphTokenClaims(token string) (*FederatedGraphTokenClaims,
 
 	_, _, err := jwtParser.ParseUnverified(token, claims)
 	if err != nil {
-		return nil, fmt.Errorf("invalid token %w", err)
+		return nil, fmt.Errorf("invalid token: %w", err)
 	}
 
 	federatedGraphIDValue := claims[FederatedGraphIDClaim]