Remove error handling as it is not used for the moment