diff --git a/modules/core/keeper/msg_server.go b/modules/core/keeper/msg_server.go
index 28f99a2373e..37b7097d05c 100644
--- a/modules/core/keeper/msg_server.go
+++ b/modules/core/keeper/msg_server.go
@@ -856,17 +856,17 @@ func (k Keeper) ChannelUpgradeAck(goCtx context.Context, msg *channeltypes.MsgCh
 	}
 
 	app, ok := k.Router.GetRoute(module)
-	invalidroute := errorsmod.Wrapf(porttypes.ErrInvalidRoute, "route not found to module: %s", module)
+	err = errorsmod.Wrapf(porttypes.ErrInvalidRoute, "route not found to module: %s", module)
 	if !ok {
-		ctx.Logger().Error("channel upgrade ack failed", "port-id", msg.PortId, "error", invalidroute)
-		return nil, invalidroute
+		ctx.Logger().Error("channel upgrade ack failed", "port-id", msg.PortId, "error", err)
+		return nil, err
 	}
 
 	cbs, ok := app.(porttypes.UpgradableModule)
-	invalidupgraderoute := errorsmod.Wrapf(porttypes.ErrInvalidRoute, "upgrade route not found to module: %s", module)
+	err = errorsmod.Wrapf(porttypes.ErrInvalidRoute, "upgrade route not found to module: %s", module)
 	if !ok {
-		ctx.Logger().Error("channel upgrade ack failed", "port-id", msg.PortId, "error", invalidupgraderoute)
-		return nil, invalidupgraderoute
+		ctx.Logger().Error("channel upgrade ack failed", "port-id", msg.PortId, "error", err)
+		return nil, err
 	}
 
 	err = k.ChannelKeeper.ChanUpgradeAck(ctx, msg.PortId, msg.ChannelId, msg.CounterpartyUpgrade, msg.ProofChannel, msg.ProofUpgrade, msg.ProofHeight)
@@ -917,17 +917,17 @@ func (k Keeper) ChannelUpgradeConfirm(goCtx context.Context, msg *channeltypes.M
 	}
 
 	app, ok := k.Router.GetRoute(module)
-	invalidroute := errorsmod.Wrapf(porttypes.ErrInvalidRoute, "route not found to module: %s", module)
+	err = errorsmod.Wrapf(porttypes.ErrInvalidRoute, "route not found to module: %s", module)
 	if !ok {
-		ctx.Logger().Error("channel upgrade confirm failed", "port-id", msg.PortId, "error", invalidroute)
-		return nil, invalidroute
+		ctx.Logger().Error("channel upgrade confirm failed", "port-id", msg.PortId, "error", err)
+		return nil, err
 	}
 
 	cbs, ok := app.(porttypes.UpgradableModule)
-	invalidupgraderoute := errorsmod.Wrapf(porttypes.ErrInvalidRoute, "upgrade route not found to module: %s", module)
+	err = errorsmod.Wrapf(porttypes.ErrInvalidRoute, "upgrade route not found to module: %s", module)
 	if !ok {
-		ctx.Logger().Error("channel upgrade confirm failed", "port-id", msg.PortId, "error", invalidupgraderoute)
-		return nil, invalidupgraderoute
+		ctx.Logger().Error("channel upgrade confirm failed", "port-id", msg.PortId, "error", err)
+		return nil, err
 	}
 
 	err = k.ChannelKeeper.ChanUpgradeConfirm(ctx, msg.PortId, msg.ChannelId, msg.CounterpartyChannelState, msg.CounterpartyUpgrade, msg.ProofChannel, msg.ProofUpgrade, msg.ProofHeight)
@@ -979,16 +979,16 @@ func (k Keeper) ChannelUpgradeOpen(goCtx context.Context, msg *channeltypes.MsgC
 	}
 
 	app, ok := k.Router.GetRoute(module)
-	invalidroute := errorsmod.Wrapf(porttypes.ErrInvalidRoute, "route not found to module: %s", module)
+	err = errorsmod.Wrapf(porttypes.ErrInvalidRoute, "route not found to module: %s", module)
 	if !ok {
-		ctx.Logger().Error("channel upgrade open failed", "port-id", msg.PortId, "error", invalidroute)
-		return nil, invalidroute
+		ctx.Logger().Error("channel upgrade open failed", "port-id", msg.PortId, "error", err)
+		return nil, err
 	}
 	cbs, ok := app.(porttypes.UpgradableModule)
-	invalidupgraderoute := errorsmod.Wrapf(porttypes.ErrInvalidRoute, "upgrade route not found to module: %s", module)
+	err = errorsmod.Wrapf(porttypes.ErrInvalidRoute, "upgrade route not found to module: %s", module)
 	if !ok {
-		ctx.Logger().Error("channel upgrade open failed", "port-id", msg.PortId, "error", invalidupgraderoute)
-		return nil, invalidupgraderoute
+		ctx.Logger().Error("channel upgrade open failed", "port-id", msg.PortId, "error", err)
+		return nil, err
 	}
 
 	if err = k.ChannelKeeper.ChanUpgradeOpen(ctx, msg.PortId, msg.ChannelId, msg.CounterpartyChannelState, msg.ProofChannel, msg.ProofHeight); err != nil {
@@ -1021,18 +1021,18 @@ func (k Keeper) ChannelUpgradeTimeout(goCtx context.Context, msg *channeltypes.M
 	}
 
 	app, ok := k.Router.GetRoute(module)
-	invalidroute := errorsmod.Wrapf(porttypes.ErrInvalidRoute, "route not found to module: %s", module)
+	err = errorsmod.Wrapf(porttypes.ErrInvalidRoute, "route not found to module: %s", module)
 	if !ok {
-		ctx.Logger().Error("channel upgrade timeout failed", "port-id", msg.PortId, "error", invalidroute)
-		return nil, invalidroute
+		ctx.Logger().Error("channel upgrade timeout failed", "port-id", msg.PortId, "error", err)
+		return nil, err
 	}
 
 	cbs, ok := app.(porttypes.UpgradableModule)
-	invalidupgraderoute := errorsmod.Wrapf(porttypes.ErrInvalidRoute, "upgrade route not found to module: %s", module)
+	err = errorsmod.Wrapf(porttypes.ErrInvalidRoute, "upgrade route not found to module: %s", module)
 
 	if !ok {
-		ctx.Logger().Error("channel upgrade timeout failed", "port-id", msg.PortId, "error", invalidupgraderoute)
-		return nil, invalidupgraderoute
+		ctx.Logger().Error("channel upgrade timeout failed", "port-id", msg.PortId, "error", err)
+		return nil, err
 	}
 
 	err = k.ChannelKeeper.ChanUpgradeTimeout(ctx, msg.PortId, msg.ChannelId, msg.CounterpartyChannel, msg.ProofChannel, msg.ProofHeight)
@@ -1060,18 +1060,18 @@ func (k Keeper) ChannelUpgradeCancel(goCtx context.Context, msg *channeltypes.Ms
 	}
 
 	app, ok := k.Router.GetRoute(module)
-	invalidroute := errorsmod.Wrapf(porttypes.ErrInvalidRoute, "route not found to module: %s", module)
+	err = errorsmod.Wrapf(porttypes.ErrInvalidRoute, "route not found to module: %s", module)
 
 	if !ok {
-		ctx.Logger().Error("channel upgrade cancel failed", "port-id", msg.PortId, "error", invalidroute)
-		return nil, invalidroute
+		ctx.Logger().Error("channel upgrade cancel failed", "port-id", msg.PortId, "error", err)
+		return nil, err
 	}
 
 	cbs, ok := app.(porttypes.UpgradableModule)
-	invalidupgraderoute := errorsmod.Wrapf(porttypes.ErrInvalidRoute, "upgrade route not found to module: %s", module)
+	err = errorsmod.Wrapf(porttypes.ErrInvalidRoute, "upgrade route not found to module: %s", module)
 	if !ok {
-		ctx.Logger().Error("channel upgrade cancel failed", "port-id", msg.PortId, invalidupgraderoute)
-		return nil, invalidupgraderoute
+		ctx.Logger().Error("channel upgrade cancel failed", "port-id", msg.PortId, err)
+		return nil, err
 	}
 
 	channel, found := k.ChannelKeeper.GetChannel(ctx, msg.PortId, msg.ChannelId)