Fixed additional NPE when certain metric cannot be fetched