diff --git a/app/upgrades/testnet/v21.0.0-alpha.1/constants.go b/app/upgrades/testnet/v21.0.0-alpha.1/constants.go
index 8c5cca965..fc1dd9112 100644
--- a/app/upgrades/testnet/v21.0.0-alpha.1/constants.go
+++ b/app/upgrades/testnet/v21.0.0-alpha.1/constants.go
@@ -24,7 +24,7 @@ var Upgrade = upgrades.Upgrade{
 func v2100Alpha1UpgradeHandler(
 	mm *module.Manager,
 	cfg module.Configurator,
-	k *keepers.AppKeepers,
+	_ *keepers.AppKeepers,
 ) upgradetypes.UpgradeHandler {
 	return func(ctx sdk.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
 		logger := ctx.Logger().With("upgrade", UpgradeName)
diff --git a/app/upgrades/v13/upgrades.go b/app/upgrades/v13/upgrades.go
index 8aff7fc42..66b9d31a2 100644
--- a/app/upgrades/v13/upgrades.go
+++ b/app/upgrades/v13/upgrades.go
@@ -15,6 +15,7 @@ import (
 
 	"github.com/CosmosContracts/juno/v21/app/keepers"
 	"github.com/CosmosContracts/juno/v21/app/upgrades"
+
 	// types
 	feesharetypes "github.com/CosmosContracts/juno/v21/x/feeshare/types"
 	tokenfactorytypes "github.com/CosmosContracts/juno/v21/x/tokenfactory/types"
@@ -79,7 +80,9 @@ func CreateV13UpgradeHandler(
 		logger.Info("set feeshare params")
 
 		// Packet Forward middleware initial params
-		keepers.PacketForwardKeeper.SetParams(ctx, packetforwardtypes.DefaultParams())
+		if err := keepers.PacketForwardKeeper.SetParams(ctx, packetforwardtypes.DefaultParams()); err != nil {
+			return nil, err
+		}
 
 		return versionMap, err
 	}