Added commented out code that will fix the exceptions