Added missing class and method comments.
Added more details to error message sent when exceptions are caught.