More teardown improvements - deal with the case of the decoder pipeline being partially initialsed