diff --git a/src/map/clif.c b/src/map/clif.c
index 12867f87ec..80529cd1c7 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -2896,7 +2896,7 @@ void clif_storagelist(struct map_session_data* sd, struct item* items, int items
 		WFIFOW(sd->fd,0)=cmde;
 		WFIFOW(sd->fd,2)=sidxe+nn*se;
 #if PACKETVER >= 20120925
-		safestrncpy(WFIFOP(sd->fd,4), storename, NAME_LENGTH); //storename
+		safestrncpy(WFIFOCP(sd->fd,4), storename, NAME_LENGTH); //storename
 #endif
 		memcpy(WFIFOP(sd->fd,sidxe),bufe + sidxe + i*se,nn*se);
 		WFIFOSET(sd->fd,WFIFOW(sd->fd,2));
diff --git a/src/map/intif.c b/src/map/intif.c
index fb4cc14522..48ad3b0e94 100644
--- a/src/map/intif.c
+++ b/src/map/intif.c
@@ -3294,9 +3294,10 @@ void intif_parse_StorageInfo_recv(int fd) {
 	storage_db = NULL;
 
 	for (i = 0; i < count; i++) {
-		char name[NAME_LENGTH+1];
-		safestrncpy(name, (char *)RFIFOP(fd, 5 + size * i), NAME_LENGTH);
-		if (!name || name[0] == '\0')
+		char name[NAME_LENGTH + 1];
+
+		safestrncpy(name, RFIFOCP(fd, 5 + size * i), NAME_LENGTH);
+		if (name[0] == '\0')
 			continue;
 		RECREATE(storage_db, struct s_storage_table, storage_count+1);
 		memcpy(&storage_db[storage_count], RFIFOP(fd, 4 + size * i), size);