diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php
index 0914eee8d..65b664bf1 100644
--- a/src/pocketmine/Player.php
+++ b/src/pocketmine/Player.php
@@ -902,7 +902,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
 				$this->getDisplayName()
 			])
 		));
-		if(strlen(trim($ev->getJoinMessage())) > 0){
+		if(strlen(trim((string) $ev->getJoinMessage())) > 0){
 			$this->server->broadcastMessage($ev->getJoinMessage());
 		}
 
diff --git a/src/pocketmine/Server.php b/src/pocketmine/Server.php
index 677e2c8d5..c82522543 100644
--- a/src/pocketmine/Server.php
+++ b/src/pocketmine/Server.php
@@ -1654,12 +1654,12 @@ class Server{
 	}
 
 	/**
-	 * @param string   $message
+	 * @param TextContainer|string   $message
 	 * @param Player[] $recipients
 	 *
 	 * @return int
 	 */
-	public function broadcastMessage(string $message, array $recipients = []) : int{
+	public function broadcastMessage($message, array $recipients = []) : int{
 		if(!is_array($recipients)){
 			return $this->broadcast($message, self::BROADCAST_CHANNEL_USERS);
 		}