Began implementation of exception handling