Reviewed error handling for legacy datasources