Minor updates

1) Exceptions added