Fixing issue with NPE on metric calculations

Sidekick: @jstenhouse 
FYI: @briandela