DEVEL-986: Better exception handling, do make data fetching more robust
Merge branch 'new_fetch_exception'