Fixed shutdown error closes #2085

I think you effectively already reviewed this on the other branch, @oxtoacart, so assigning over to you.