Improved null Root handling.
My last commit for this file was really the entire implementation.