Several changes to try-catch, generation done