Update estop return from ok to {ok, estop}