Added protection for ROOT-5428