WHY

This change is needed to retry or appropriately update etcd

WHAT

Review code base for error handling scenarios

HOW

Make relevant code changes and print appropriate error strings.

TESTS

Write additional tests for error handling

DONE

Increase in test cases that support error handling use case.