Added NPE protection when gathering metrics
Merge pull request #55 from mattrjacobs/protect-npe-metrics

Added NPE protection when gathering metrics