some renaming of exceptions