diff --git a/matrix-bot/matrix-bot.go b/matrix-bot/matrix-bot.go
index 54e18eb..3a1e546 100755
--- a/matrix-bot/matrix-bot.go
+++ b/matrix-bot/matrix-bot.go
@@ -2,6 +2,7 @@ package matrixbot
 
 import (
 	"fmt"
+	"log"
 
 	"maunium.net/go/mautrix"
 	"maunium.net/go/mautrix/event"
@@ -16,7 +17,8 @@ func SendMessage(roomID string, topic string, header string, content string, url
 	client, err := mautrix.NewClient(cfg.HomeserverUrl, "", "")
 
 	if err != nil {
-		panic(err)
+		log.Println("New client, err:", err.Error())
+		return
 	}
 
 	_, err = client.Login(&mautrix.ReqLogin{
@@ -27,10 +29,15 @@ func SendMessage(roomID string, topic string, header string, content string, url
 	})
 
 	if err != nil {
-		panic(err)
+		log.Println("Client login, err:", err.Error())
+		return
 	}
 
 	msg := format.RenderMarkdown(fmt.Sprintf("Thema: %s <h4>%s</h4>%s<br>%s", topic, header, content, url), false, true)
 
-	client.SendMessageEvent(id.RoomID(roomID), event.EventMessage, &msg)
+	_, err = client.SendMessageEvent(id.RoomID(roomID), event.EventMessage, &msg)
+
+	if err != nil {
+		log.Println("SendMessageEvent, err:", err.Error())
+	}
 }