Handled data fetch errors more gracefully