diff --git a/plugins/dex/order/handler.go b/plugins/dex/order/handler.go
index 3e5d0b74f..a0d198696 100644
--- a/plugins/dex/order/handler.go
+++ b/plugins/dex/order/handler.go
@@ -32,9 +32,6 @@ func NewHandler(dexKeeper *DexKeeper) sdk.Handler {
 			}
 			return handleNewOrder(ctx, dexKeeper, msg)
 		case CancelOrderMsg:
-			if sdk.IsUpgrade(sdk.BEPXXX) {
-				return sdk.ErrMsgNotSupported("").Result()
-			}
 			return handleCancelOrder(ctx, dexKeeper, msg)
 		default:
 			errMsg := fmt.Sprintf("Unrecognized dex msg type: %v", reflect.TypeOf(msg).Name())
diff --git a/plugins/tokens/plugin.go b/plugins/tokens/plugin.go
index d767760a3..f5f0dbdd6 100644
--- a/plugins/tokens/plugin.go
+++ b/plugins/tokens/plugin.go
@@ -71,7 +71,11 @@ func EndBlocker(ctx sdk.Context, timelockKeeper timelock.Keeper, swapKeeper swap
 			logger.Error("ParseKeyRecord error", "error", err)
 			continue
 		}
-		timelockKeeper.TimeUnlock(ctx, addr, id)
+		err = timelockKeeper.TimeUnlock(ctx, addr, id)
+		if err != nil {
+			logger.Error("TimeUnlock error", "error", err)
+			continue
+		}
 		i++
 	}