Add in special case handler for bootstrap errors