Simplify check for normal stop operation

Simplify check for normal stop operation