Bug fixes

Null check fix in Metrics Activity