Add stale exception handling