diff --git a/node/boto.js b/node/boto.js
index 3c3f751..fb5905d 100644
--- a/node/boto.js
+++ b/node/boto.js
@@ -71,7 +71,12 @@ client.on('message', (channel, tags, message, self) => {
       // Shoutout
       if(command === 'so' ||
       command === 'shoutout') {
-        client.say(channel, `/me Bleep! Bloop! Roll the clip! Smash @${args.join(' ')}'s follow button at: https://twitch.tv/${args.join(' ')}`);
+        if(${args.join(' ')} === '') {
+          client.say(channel, `/me Bleep! Bloop! Oops, looks like ${tags.username} for to tag someone!`);
+        }
+        else{
+          client.say(channel, `/me Bleep! Bloop! Roll the clip! Smash @${args.join(' ')}'s follow button at: https://twitch.tv/${args.join(' ')}`);
+        }
       }
 
       // CHAT MODE: Emotes