Small comments.
Bug with exceptions fixed.