Added support for null block providers