Improved names of exception.