Seems we still need the null checking in Expression::addVariable. Need to root out why. Refs #52