Scrutinizer Exceptions Fixed