diff --git a/dlna/contenddirectoryservice.go b/dlna/contenddirectoryservice.go
index 0c1a07145..e6bbc7ee1 100644
--- a/dlna/contenddirectoryservice.go
+++ b/dlna/contenddirectoryservice.go
@@ -256,7 +256,7 @@ func (cds *contentDirectoryService) readContainer(o object, host string) (ret []
 			return ret, nil
 		}
 	}
-	return
+	return ret, nil
 }
 
 func (cds *contentDirectoryService) doMediaFiles(tracks model.MediaFiles, basePath string, ret []interface{}, host string) ([]interface{}, error) {
diff --git a/dlna/dlnaserver.go b/dlna/dlnaserver.go
index ca6b2a64e..587def9fa 100644
--- a/dlna/dlnaserver.go
+++ b/dlna/dlnaserver.go
@@ -253,13 +253,12 @@ func (s *SSDPServer) ssdpInterface(intf net.Interface) {
 	}
 	defer ssdpServer.Close()
 
-	log.Info(fmt.Sprintf("Started SSDP on %v", intf.Name))
+	log.Info("Started SSDP", "intf.Name", intf.Name)
 	stopped := make(chan struct{})
 	go func() {
 		defer close(stopped)
 		if err := ssdpServer.Serve(); err != nil {
-			log.Error(fmt.Sprintf("Err %q", intf.Name), err)
-
+			log.Error("Error in ssdpServer Serve", "intf.Name", intf.Name, err)
 		}
 	}()
 	select {