fix: catch more shutdown issues to resolve shutdown without dropping

fix: catch more shutdown issues to resolve shutdown without dropping #309