Provider better error handling functionality