Remove NoSolutionFound Exception and code that handled it