fix: Replace asserts with None checks for graceful shutdown

fix: Replace asserts with None checks for graceful shutdown #1847