Provider better error handling functionality
merge