diff --git a/pkg/handlers/command.go b/pkg/handlers/command.go
index 83102f9..8b94c4c 100644
--- a/pkg/handlers/command.go
+++ b/pkg/handlers/command.go
@@ -78,6 +78,7 @@ func HandleCommand(message twitch.PrivateMessage, twitchClient *twitch.Client, u
 	case "uptime":
 		if msgLen == 1 {
 			commands.Uptime(message.Channel, message.Channel, twitchClient)
+			return
 		} else {
 			commands.Uptime(message.Channel, cmdParams[1], twitchClient)
 			return
@@ -85,14 +86,18 @@ func HandleCommand(message twitch.PrivateMessage, twitchClient *twitch.Client, u
 	case "godoc":
 		if msgLen == 1 {
 			twitchClient.Say(message.Channel, "Usage: ()godoc [term]")
+			return
 		} else {
 			commands.Godocs(message.Channel, message.Message[8:len(message.Message)], twitchClient)
+			return
 		}
 	case "godocs":
 		if msgLen == 1 {
 			twitchClient.Say(message.Channel, "Usage: ()godoc [term]")
+			return
 		} else {
 			commands.Godocs(message.Channel, message.Message[9:len(message.Message)], twitchClient)
+			return
 		}
 
 	}