complete refactoring to the error handling code and small corrections to the converters