Revert "Added check on Stop"

This reverts commit 36dee8286c1a94f065bb1cf0ec9506e098eeb1f9.
Revert "Revert "Added check on Stop""

This reverts commit db152385d0b8d2b6d6685d3ee67c092c88f11799.