Fixed NULL vs. Guest problem