diff --git a/providers/hypersh/hypersh.go b/providers/hypersh/hypersh.go
index 502d82027..dba97fea3 100755
--- a/providers/hypersh/hypersh.go
+++ b/providers/hypersh/hypersh.go
@@ -443,7 +443,7 @@ func (p *HyperProvider) NodeAddresses() []v1.NodeAddress {
 // NodeDaemonEndpoints returns NodeDaemonEndpoints for the node status
 // within Kubernetes.
 func (p *HyperProvider) NodeDaemonEndpoints() *v1.NodeDaemonEndpoints {
-	return nil
+	return &v1.NodeDaemonEndpoints{}
 }
 
 // OperatingSystem returns the operating system for this provider.
diff --git a/vkubelet/vkubelet.go b/vkubelet/vkubelet.go
index 8f5702dd9..aac4d60c8 100644
--- a/vkubelet/vkubelet.go
+++ b/vkubelet/vkubelet.go
@@ -288,8 +288,8 @@ func (s *Server) updateNode(ctx context.Context) {
 	if errors.IsNotFound(err) {
 		if err = s.registerNode(ctx); err != nil {
 			log.G(ctx).WithError(err).Error("Failed to register node")
-			return
 		}
+		return
 	}
 
 	n.ResourceVersion = "" // Blank out resource version to prevent object has been modified error