Added Equation Null Check