Fixing the null pointer I introduced... sigh.