More logs, fewer panics

[#73340564]

Signed-off-by: Ruthie Byers <rbyers@pivotallabs.com>