Updates and Added Exceptions