Fix panic if there is a plugin configuration error in the server (spi…

…ffe#3166)

Signed-off-by: Agustín Martínez Fayó <amartinezfayo@gmail.com>

pkg/server/catalog/catalog.go

@@ -97,18 +97,22 @@ func (repo *Repository) Services() []catalog.ServiceRepo {
 func (repo *Repository) Close() {
 	// Must close in reverse initialization order!
 
-	repo.log.Debug("Closing catalog")
-	if err := repo.catalogCloser.Close(); err == nil {
-		repo.log.Info("Catalog closed")
-	} else {
-		repo.log.WithError(err).Error("Failed to close catalog")
+	if repo.catalogCloser != nil {
+		repo.log.Debug("Closing catalog")
+		if err := repo.catalogCloser.Close(); err == nil {
+			repo.log.Info("Catalog closed")
+		} else {
+			repo.log.WithError(err).Error("Failed to close catalog")
+		}
 	}
 
-	repo.log.Debug("Closing DataStore")
-	if err := repo.dataStoreCloser.Close(); err == nil {
-		repo.log.Info("DataStore closed")
-	} else {
-		repo.log.WithError(err).Error("Failed to close DataStore")
+	if repo.dataStoreCloser != nil {
+		repo.log.Debug("Closing DataStore")
+		if err := repo.dataStoreCloser.Close(); err == nil {
+			repo.log.Info("DataStore closed")
+		} else {
+			repo.log.WithError(err).Error("Failed to close DataStore")
+		}
 	}
 }