diff --git a/DeukBot4/MessageHandlers/ReminderHandler.cs b/DeukBot4/MessageHandlers/ReminderHandler.cs
index e87d7f0..657e21e 100644
--- a/DeukBot4/MessageHandlers/ReminderHandler.cs
+++ b/DeukBot4/MessageHandlers/ReminderHandler.cs
@@ -11,7 +11,7 @@ namespace DeukBot4.MessageHandlers
     {
         private static readonly Regex ReminderMatcher =
             new Regex(
-                @".*(remind\s*((?<recipient>me)|<@!*(?<recipient>\d*)>)\s*to)(?<action>.*)(in\s+)(?<time>.*)",
+                @".*(remind\s*((?<recipient>me)|<@!*(?<recipient>\d*)>)\s*)(\s+to(?<action>.+)|\s+in\s+(?<time>.+)){2}",
                 RegexOptions.IgnoreCase);
 
         public static async Task HandleReminder(SocketMessage message)
@@ -23,10 +23,12 @@ namespace DeukBot4.MessageHandlers
             }
 
             var recipient = match.Groups["recipient"].Captures[0].Value;
-            var action    = match.Groups["action"].Value.Trim();
+            var action    = match.Groups["action"]?.Value.Trim();
             if (string.IsNullOrWhiteSpace(action))
                 return;
-            var time = match.Groups["time"].Value;
+            var time = match.Groups["time"]?.Value;
+            if (string.IsNullOrWhiteSpace(time))
+                return;
             var timespan = ParseTime(time);
             if (!timespan.HasValue)
                 return;