diff --git a/src/filesystem.c b/src/filesystem.c
index f7ed53e..6b91282 100644
--- a/src/filesystem.c
+++ b/src/filesystem.c
@@ -137,13 +137,11 @@ signed int prepare_log_path(IRC_Message* message, PathBuf* pathbuffer, Connectio
 		elements[1].isdir = false;
 	} else if (ISCMD(PRIVMSG) || ISCMD(NOTICE)) {
 		if (message->args[0] == NULL) return -2;
-		if (*message->args[0] != '#' && *message->args[0] != '&' && *message->args[0] != '+' && *message->args[0] != '!') {
+		if (*message->args[0] != '#' && *message->args[0] != '&' && *message->args[0] != '+' && *message->args[0] != '!' && message->name.nick != NULL) {
 			elements[0].name = reused_strings[1];
-			strncpy(temp, message->args[0], sizeof(temp));
-		} else if (message->name.nick != NULL) {
 			strncpy(temp, message->name.nick, sizeof(temp));
-		} else
-			return -2;
+		} else 
+			strncpy(temp, message->args[0], sizeof(temp));
 		cleanup_path_names(temp);
 		elements[1].name = temp;
 	} else if (ISCMD(RPL_TOPIC) || ISCMD(RPL_NOTOPIC)) {