Added exception stuffs