Ensure dir switching is cleaned up properly in case of exception
Ensure dir switching is cleaned up properly in case of exception

jreinert/yard,thomthom/yard,iankronquist/yard,iankronquist/yard,thomthom/yard,jreinert/yard,thomthom/yard,amclain/yard,amclain/yard,herosky/yard,amclain/yard,jreinert/yard,iankronquist/yard,lsegal/yard,ohai/yard,ohai/yard,alexdowad/yard,herosky/yard,alexdowad/yard,lsegal/yard,alexdowad/yard,ohai/yard,herosky/yard,lsegal/yard