Merge "Simplify the return condition in stop()"