Build fix + retry + optional exc deferal