Finished adding new exception system