Merge pull request #357 from zachriggle/cs-none-cleanup

Fix error when _cs is None during teardown