add diff-retrieving call and associated error handling.