Improve exception handling and update copyright notice.

Need to add method level comments in this class overall.