This could potentially help with debugging exactly what happened with some issue down the line. (imported from commit cc7321d742875b644d4727a084b462dcd01dcf10)