improve resiliency

Referenced in:

• Dead-Letter-Queue