Always clean-up sr and pbds, even if an exception occured

Change-Id: I12bb91f8d6b7696afe5fde67652a61d6d8189548