fix err message
fix stop logic