diff --git a/agent.go b/agent.go
index a9d77e2670..ca26a22bea 100644
--- a/agent.go
+++ b/agent.go
@@ -583,7 +583,7 @@ func (ep *endpoint) deleteDriverInfoFromCluster() error {
 }
 
 func (ep *endpoint) addServiceInfoToCluster(sb *sandbox) error {
-	if ep.isAnonymous() && len(ep.myAliases) == 0 || ep.Iface().Address() == nil {
+	if ep.isAnonymous() && len(ep.myAliases) == 0 || ep.Iface() == nil || ep.Iface().Address() == nil {
 		return nil
 	}
 
diff --git a/endpoint_info.go b/endpoint_info.go
index 80b662defa..3b9263f216 100644
--- a/endpoint_info.go
+++ b/endpoint_info.go
@@ -216,7 +216,7 @@ func (ep *endpoint) Iface() InterfaceInfo {
 		return ep.iface
 	}
 
-	return nil
+	return &endpointInterface{}
 }
 
 func (ep *endpoint) Interface() driverapi.InterfaceInfo {