More corrections and tests, including new Exception.