maha | removed un-necessay metrics counter. Added more error handling scenarios