Add Exception, and add exception test