Added exception handling all over the place