Reset yaml locations on any error, closes #1007