Fix for SCC provider, resolves NoneType issues