Better Logging and guard against Equation errors