null checker added to solver