add exception

minor edits
added more exceptions

more exceptions