diff --git a/markets/storageadapter/ondealexpired.go b/markets/storageadapter/ondealexpired.go
index 2d13c04b53b..e57b396343c 100644
--- a/markets/storageadapter/ondealexpired.go
+++ b/markets/storageadapter/ondealexpired.go
@@ -114,7 +114,7 @@ func (mgr *DealExpiryManager) OnDealExpiredOrSlashed(ctx context.Context, publis
 
 		changedDeals, ok := states.(state.ChangedDeals)
 		if !ok {
-			panic("Expected state.ChangedDeals")
+			return false, xerrors.Errorf("OnDealExpireOrSlashed stateChanged: Expected state.ChangedDeals")
 		}
 
 		deal, ok := changedDeals[res.DealID]