diff --git a/.gitignore b/.gitignore
index cd2946a..0121627 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,6 @@ $RECYCLE.BIN/
 Network Trash Folder
 Temporary Items
 .apdisk
+
+# Visual Studio Code stuff
+.vscode
\ No newline at end of file
diff --git a/bot.py b/bot.py
index 1531e81..156098d 100644
--- a/bot.py
+++ b/bot.py
@@ -19,11 +19,12 @@ def get_bot_id(self):
 		if api_call.get('ok'):
 			# retrieve all users so we can find our bot
 			users = api_call.get('members')
+			user_id = None
 			for user in users:
 				if 'name' in user and user.get('name') == self.bot_name:
-					return "<@" + user.get('id') + ">"
+					user_id =  "<@" + user.get('id') + ">"
 			
-			return None
+		return user_id
 			
 	def listen(self):
 		if self.slack_client.rtm_connect(with_team_state=False):
diff --git a/event.py b/event.py
index 1a1baaf..49fda08 100644
--- a/event.py
+++ b/event.py
@@ -14,7 +14,7 @@ def wait_for_event(self):
 				self.parse_event(event)
 				
 	def parse_event(self, event):
-		if event and 'text' in event and self.bot.bot_id in event['text']:
+		if event and 'text' in event and self.bot.bot_id in event['text'] and event['user'] not in self.bot.bot_id:
 			self.handle_event(event['user'], event['text'].split(self.bot.bot_id)[1].strip().lower(), event['channel'])
 	
 	def handle_event(self, user, command, channel):