Add an explicit guard for root presence