Issue #13: add a check when data is retrieved.