Fixed lock when waiting for SR to complete or exception when stopping