LILY-306: better error on dataprovider fail
Merge branch 'feature/LILY-306-better-dataprovider-error' into develop