diff --git a/cron/message.go b/cron/message.go
index cb621b3..c81b70b 100644
--- a/cron/message.go
+++ b/cron/message.go
@@ -75,7 +75,7 @@ func formatMsgLink(text string, url string) string {
 	if url == "" {
 		return text
 	}
-	return fmt.Sprintf("[%s](%s)", text, url)
+	return fmt.Sprintf("[``%s``](%s)", text, url)
 }
 
 func formatMsgAboutVillageLost(msgData messageData) string {
@@ -88,7 +88,7 @@ func formatMsgAboutVillageLost(msgData messageData) string {
 }
 
 func formatMsgAboutVillageConquest(msgData messageData) string {
-	return fmt.Sprintf(`Gracz %s (%s) podbił wioskę %s od gracza %s (%s)`,
+	return fmt.Sprintf("Gracz %s (%s) podbił wioskę %s od gracza %s (%s)",
 		formatMsgLink(msgData.newOwnerName, msgData.newOwnerURL),
 		formatMsgLink(msgData.newOwnerTribeTag, msgData.newOwnerTribeURL),
 		formatMsgLink(msgData.village, msgData.villageURL),
diff --git a/discord/commands.go b/discord/commands.go
index 7510309..6373253 100644
--- a/discord/commands.go
+++ b/discord/commands.go
@@ -6,8 +6,6 @@ import (
 	"math"
 	"strconv"
 
-	"log"
-
 	shared_models "github.com/tribalwarshelp/shared/models"
 
 	"github.com/bwmarrin/discordgo"
@@ -107,7 +105,7 @@ func (s *Session) handleTribeCommand(m *discordgo.MessageCreate, args ...string)
 	ids := []int{}
 	for _, arg := range args[3:argsLength] {
 		id, err := strconv.Atoi(arg)
-		if err != nil {
+		if err != nil || id <= 0 {
 			continue
 		}
 		ids = append(ids, id)
@@ -160,22 +158,33 @@ func (s *Session) handleTribeCommand(m *discordgo.MessageCreate, args ...string)
 		Tribe: true,
 	})
 	if err != nil {
-		s.SendMessage(m.ChannelID, fmt.Sprintf("%s Nie udało się wygenerować listy.", m.Author.Mention()))
+		s.SendMessage(m.ChannelID,
+			fmt.Sprintf("%s Wystąpił błąd podczas pobierania danych z API, prosimy spróbować później.", m.Author.Mention()))
 		return
 	}
-	if playersList.Total == 0 {
-		s.SendMessage(m.ChannelID, fmt.Sprintf("%s Nie znaleziono plemion o podanych ID.", m.Author.Mention()))
+	if playersList == nil || playersList.Total == 0 {
+		s.SendMessage(m.ChannelID, fmt.Sprintf("%s Nie znaleziono graczy należących do plemion o podanych ID.", m.Author.Mention()))
+		return
+	}
+	totalPages := int(math.Ceil(float64(playersList.Total) / float64(limit)))
+	if page > totalPages {
+		s.SendMessage(m.ChannelID, fmt.Sprintf("%s Przekroczyłeś limit stron (%d/%d).", m.Author.Mention(), page, totalPages))
 		return
 	}
 
-	langVersion, err := s.cfg.API.LangVersions.Read(utils.LanguageCodeFromWorldName(world))
-	if err != nil {
-		s.SendMessage(m.ChannelID, fmt.Sprintf("%s Nie udało się wygenerować listy.", m.Author.Mention()))
+	langTag := utils.LanguageCodeFromWorldName(world)
+	langVersion, err := s.cfg.API.LangVersions.Read(langTag)
+	if err != nil || langVersion == nil {
+		s.SendMessage(m.ChannelID, fmt.Sprintf("%s Nie znaleziono wersji językowej: %s.", m.Author.Mention(), langTag))
 		return
 	}
 
 	msg := &EmbedMessage{}
 	for i, player := range playersList.Items {
+		if player == nil {
+			continue
+		}
+
 		rank := 0
 		score := 0
 		switch command {
@@ -196,17 +205,23 @@ func (s *Session) handleTribeCommand(m *discordgo.MessageCreate, args ...string)
 			score = player.Points
 		}
 
-		msg.Append(fmt.Sprintf("**%d**. [%s](%s) (Plemię: [%s](%s) | Ranking ogólny: **%d** | Wynik: **%d**)\n",
+		tribeTag := "-"
+		tribeURL := "-"
+		if player.Tribe != nil {
+			tribeTag = player.Tribe.Tag
+			tribeURL = utils.FormatTribeURL(world, langVersion.Host, player.Tribe.ID)
+		}
+
+		msg.Append(fmt.Sprintf("**%d**. [``%s``](%s) (Plemię: [``%s``](%s) | Ranking ogólny: **%d** | Wynik: **%d**)\n",
 			offset+i+1,
 			player.Name,
 			utils.FormatPlayerURL(world, langVersion.Host, player.ID),
-			player.Tribe.Tag,
-			utils.FormatTribeURL(world, langVersion.Host, player.Tribe.ID),
+			tribeTag,
+			tribeURL,
 			rank,
 			score))
 	}
 
-	totalPages := int(math.Round(float64(playersList.Total) / float64(limit)))
 	s.SendEmbed(m.ChannelID, NewEmbed().
 		SetTitle(title).
 		SetDescription("A oto lista!").
@@ -308,7 +323,6 @@ func (s *Session) handleObserveCommand(m *discordgo.MessageCreate, args ...strin
 	}
 	err = s.cfg.ServerRepository.Store(context.Background(), dcServer)
 	if err != nil {
-		log.Print(err)
 		s.SendMessage(m.ChannelID, m.Author.Mention()+` Nie udało się dodać plemienia do obserwowanych.`)
 		return
 	}
@@ -324,7 +338,6 @@ func (s *Session) handleObserveCommand(m *discordgo.MessageCreate, args ...strin
 		ServerID: dcServer.ID,
 	})
 	if err != nil {
-		log.Print(err)
 		s.SendMessage(m.ChannelID, m.Author.Mention()+` Nie udało się dodać plemienia do obserwowanych.`)
 		return
 	}
diff --git a/discord/embed.go b/discord/embed.go
index 6ae526a..8a96f8d 100644
--- a/discord/embed.go
+++ b/discord/embed.go
@@ -1,6 +1,10 @@
 package discord
 
-import "github.com/bwmarrin/discordgo"
+import (
+	"sync"
+
+	"github.com/bwmarrin/discordgo"
+)
 
 // Constants for message embed character limits
 const (
@@ -251,10 +255,13 @@ func (e *Embed) TruncateFooter() *Embed {
 type EmbedMessage struct {
 	Chunks []string
 	Index  int
+	mutex  sync.Mutex
 }
 
 func (msg *EmbedMessage) Append(m string) {
-	if len(msg.Chunks) < msg.Index+1 {
+	msg.mutex.Lock()
+	defer msg.mutex.Unlock()
+	for len(msg.Chunks) < msg.Index+1 {
 		msg.Chunks = append(msg.Chunks, "")
 	}
 
@@ -268,6 +275,8 @@ func (msg *EmbedMessage) Append(m string) {
 }
 
 func (msg *EmbedMessage) ToMessageEmbedFields() []*discordgo.MessageEmbedField {
+	msg.mutex.Lock()
+	defer msg.mutex.Unlock()
 	fields := []*discordgo.MessageEmbedField{}
 	for _, chunk := range msg.Chunks {
 		fields = append(fields, &discordgo.MessageEmbedField{