Fix for case when remote peer returns error and expiration is enabled.