ONS class ready for testing and then error handling