diff --git a/server/modules/routing/binlog/blr.c b/server/modules/routing/binlog/blr.c
index 18cd06eff..26decad7d 100644
--- a/server/modules/routing/binlog/blr.c
+++ b/server/modules/routing/binlog/blr.c
@@ -618,7 +618,7 @@ ROUTER_SLAVE	 *slave = (ROUTER_SLAVE *)router_session;
 			LOGFILE_MESSAGE,
 			"%s: Master %s disconnected after %ld seconds. "
 			"%d events read,",
-			router->service->name, router->master->remote,
+			router->service->name, router->service->dbref->server->name,
 			time(0) - router->connect_time, router->stats.n_binlogs_ses)));
         	LOGIF(LE, (skygw_log_write_flush(
 			LOGFILE_ERROR,
@@ -1122,7 +1122,7 @@ char		msg[85], *errmsg;
 		LOGFILE_MESSAGE,
 		"%s: Master %s disconnected after %ld seconds. "
 		"%d events read.",
-		router->service->name, router->master->remote,
+		router->service->name, router->service->dbref->server->name,
 		time(0) - router->connect_time, router->stats.n_binlogs_ses)));
 	blr_master_reconnect(router);
 }
diff --git a/server/modules/routing/binlog/blr_master.c b/server/modules/routing/binlog/blr_master.c
index c5e33af9f..351f30336 100644
--- a/server/modules/routing/binlog/blr_master.c
+++ b/server/modules/routing/binlog/blr_master.c
@@ -157,7 +157,7 @@ GWBUF	*buf;
         LOGIF(LM,(skygw_log_write(
                         LOGFILE_MESSAGE,
 				"%s: attempting to connect to master server %s.",
-			router->service->name, router->master->remote)));
+			router->service->name, router->service->dbref->server->name)));
 	router->connect_time = time(0);
 
 if (setsockopt(router->master->fd, SOL_SOCKET, SO_KEEPALIVE, &keepalive , sizeof(keepalive )))
@@ -587,7 +587,7 @@ char	query[128];
 				"%s: Request binlog records from %s at "
 				"position %d from master server %s.",
 			router->service->name, router->binlog_name,
-			router->binlog_position, router->master->remote)));
+			router->binlog_position, router->service->dbref->server->name)));
 		break;
 	case BLRM_BINLOGDUMP:
 		// Main body, we have received a binlog record from the master
diff --git a/server/modules/routing/binlog/blr_slave.c b/server/modules/routing/binlog/blr_slave.c
index 9d0edbe9d..f23e25db9 100644
--- a/server/modules/routing/binlog/blr_slave.c
+++ b/server/modules/routing/binlog/blr_slave.c
@@ -809,7 +809,7 @@ int	len, actual_len, col_len, seqno, ncols, i;
 	strncpy((char *)ptr, column, col_len);		// Result string
 	ptr += col_len;
 
-	sprintf(column, "%s", router->master->remote ? router->master->remote : "");
+	sprintf(column, "%s", router->service->dbref->server->name ? router->service->dbref->server->name : "");
 	col_len = strlen(column);
 	*ptr++ = col_len;					// Length of result string
 	strncpy((char *)ptr, column, col_len);		// Result string