Finish an incomplete fix so we don't get a NameError
Merge pull request #244 from zenoss/feature/ZEN-13260

Finish an incomplete fix so we don't get a NameError