Add additional debug logging to retrieve for issue #1902