This makes the provider utils implementation return null for those cases, and fixes all callers which didn't check for that.