Missed a couple of logging/exception improvements that I meant to add