Exception added
Changed names of Errors
Some small change.