Minor updates.

Exceptions added.