Ensure that DS filters are cleaned up if an exception occurs