Exceptions Fixed