diff --git a/src/bot.cpp b/src/bot.cpp
index 28580a3..fbe1483 100644
--- a/src/bot.cpp
+++ b/src/bot.cpp
@@ -144,6 +144,8 @@ std::string Bot::gameToMessage(const Game& g, std::vector<TelegramAPI::MessageEn
 		} else {
 			out << "Winner: " << g.getWinner() << std::endl;
 		}
+	} else if(!g.ready()) {
+		out << "Waiting for players";
 	} else {
 		out << "nextturn: " << (g.getNextTurn() ? "X" : "O") << std::endl;
 	}
@@ -204,6 +206,11 @@ Game* Bot::messageToGame(const TelegramAPI::Message& msg) const {
 		g->addPlayer(info);
 	}
 
+	// game not ready, just stop
+	if(!g->getPlayerB()) {
+		return g;
+	}
+
 	// read the next turn value
 	char nextturn = msg.text.at(msg.text.size()-1);
 	g->setNextTurn(nextturn == 'X');