Add polite exception proessing classes and change the return type as well as unit test classes' files.