Improved null Root handling.