CLC-3379 Fix NoMethodErrors from log statements
Merge pull request #2207 from ctweney/clc-3379

CLC-3379 Fix NoMethodErrors from log statements