renaming of entities
Added useful exception handler