Improv convertor classes - throw illegal argument exception, check for null values.
Correct convertor classes, add test coverage for convertor classes.