Update exception handling
Move execute function to be handled inside this class
Change exception type