Added additional provider checks