diff --git a/mq.go b/mq.go
index 7aedf9a..4402078 100644
--- a/mq.go
+++ b/mq.go
@@ -47,7 +47,10 @@ func MQMainReceive() {
 			if err = json.Unmarshal(d.Body, &m); err != nil {
 				logOnError(err, "MQMainReceive : Can't unmarshal")
 			} else {
-				putMsg(m)
+				err = putMsg(m)
+				if err != nil {
+					logOnError(err, "MQMainReceive")
+				}
 			}
 		}
 	}()
diff --git a/sql.go b/sql.go
index 9620c06..6070893 100644
--- a/sql.go
+++ b/sql.go
@@ -79,20 +79,18 @@ func initDB() {
 	log.Println("Database set up")
 }
 
-func putMsg(m ChatWarsMessage) {
+func putMsg(m ChatWarsMessage) error {
 	stmt, err := db.Prepare(`INSERT INTO msg	(id, chat_id, user_id, date            , text)
 							 VALUES 			(?,  ?,       ?,       FROM_UNIXTIME(?), ?);`)
 	if err != nil {
-		log.Fatal(err)
+		return err
 	}
+	defer stmt.Close()
 
 	_, err = stmt.Exec(m.MsgID64, m.ChatID64, m.UserID64, m.MsgDate, m.MsgText)
 	if err != nil {
-		log.Fatal(err)
+		return err
 	}
 
-	err = stmt.Close()
-	if err != nil {
-		log.Fatal(err)
-	}
+	return nil
 }