[DF-4070] Improved error logging