Updated ProviderSerice
Fixed exceptions in the UI