minor change
minor changes in exception calls