Another fix from Josh Gao to avoid a null pointer dereference, and
minor cleanup of previous commit.
1 file changed