diff --git a/rand.js b/rand.js
index 7a63270a..c38b63a9 100644
--- a/rand.js
+++ b/rand.js
@@ -18,10 +18,12 @@ exports.random = function (text, message) {
 	});
 
 	do {
-		text = text.replace(/\[member\]/g, message.guild.members.random().user.username);
-		text = text.replace(/\[memberRand\]/, message.guild.members.random().user.username);
+		if (message) {
+			text = text.replace(/\[author\]/, message.author.username);
+			text = text.replace(/\[member\]/g, message.guild.members.random().user.username);
+			text = text.replace(/\[memberRand\]/, message.guild.members.random().user.username);
+		}
 		text = text.replace(/\[number\]/, Math.floor((Math.random() * 9) + 1));
-		text = text.replace(/\[author\]/, message.author.username);
 		text = text.replace(/\[kick\]/, ' ');
 		text = text.replace(/\[ban\]/, ' ');
 		text = text.replace(/\[delete\]/, ' ');