Tidying up BBC meta data and error reporting