Check for nil before type asserting in another place
Merge pull request #13 from zenoss/feature/fixpanic06232014

Check for nil before type asserting in another place