Normalize etcd_registry's storage & error handling