updated exceptions and docblocks
updated exceptions and docblocks