comments updated on exceptions