Fixing exception handling
Renaming clas to keep naming convention
Fixing references