Merge pull request #890 from TheBlueMatt/2021-04-fix-chan-shutdown-crash