Added exception handling, before classes