added check for null provider in drivers