Stack with error protection (#6123) - Basecamp