From f8e105b5b97e539f022b9899b8cd3f05f27f8db6 Mon Sep 17 00:00:00 2001
From: Danilo Pantani <danpantani@gmail.com>
Date: Thu, 1 Aug 2024 03:04:34 +0200
Subject: [PATCH] inmprove error handler

---
 x/claim/keeper/msg_server_claim.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/x/claim/keeper/msg_server_claim.go b/x/claim/keeper/msg_server_claim.go
index d5b62b8..91ceb2c 100644
--- a/x/claim/keeper/msg_server_claim.go
+++ b/x/claim/keeper/msg_server_claim.go
@@ -3,6 +3,7 @@ package keeper
 import (
 	"context"
 
+	"cosmossdk.io/collections"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/ignite/modules/pkg/errors"
@@ -23,7 +24,9 @@ func (k msgServer) Claim(ctx context.Context, msg *types.MsgClaim) (*types.MsgCl
 
 	// check if the claim is an initial claim
 	initialClaim, err := k.InitialClaim.Get(ctx)
-	if err == nil {
+	if err != nil && errors.IsOf(err, collections.ErrNotFound) {
+		return nil, err
+	} else if err == nil {
 		if initialClaim.MissionID == msg.MissionID {
 			if !initialClaim.Enabled {
 				return nil, types.ErrInitialClaimNotEnabled