diff --git a/x/auth/migrations/legacytx/stdsign.go b/x/auth/migrations/legacytx/stdsign.go
index e5a4e454cb..8a224ca6d7 100644
--- a/x/auth/migrations/legacytx/stdsign.go
+++ b/x/auth/migrations/legacytx/stdsign.go
@@ -126,7 +126,7 @@ func (ss StdSignature) MarshalYAML() (interface{}, error) {
 		return nil, err
 	}
 
-	return string(bz), err
+	return string(bz), nil
 }
 
 func (ss StdSignature) UnpackInterfaces(unpacker codectypes.AnyUnpacker) error {
diff --git a/x/staking/keeper/delegation.go b/x/staking/keeper/delegation.go
index 606cb1e51c..662d72b815 100644
--- a/x/staking/keeper/delegation.go
+++ b/x/staking/keeper/delegation.go
@@ -273,7 +273,11 @@ func (k Keeper) GetDelegatorUnbonding(ctx context.Context, delegator sdk.AccAddr
 		}
 		return false
 	})
-	return unbonding, err
+	if err != nil {
+		return unbonding, err
+	}
+
+	return unbonding, nil
 }
 
 // IterateDelegatorUnbondingDelegations iterates through a delegator's unbonding delegations.