Fix rare termination logic failures that could result in early shutdown

Fix rare termination logic failures that could result in early shutdown #580