Added exception blocks