diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 6af54e9..6a6c2f1 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -222,6 +222,7 @@ class MessagesController < ApplicationController
         time = Chronic.parse(string, context: :past)
       end
     rescue StandardError
+      time = nil
     end
 
     raise TimeUndetermined, "Couldn't determine a suitable time from '#{string}'" if time.nil?
diff --git a/app/jobs/send_webhook_job.rb b/app/jobs/send_webhook_job.rb
index 7c6dcb6..8228563 100644
--- a/app/jobs/send_webhook_job.rb
+++ b/app/jobs/send_webhook_job.rb
@@ -11,6 +11,7 @@ class SendWebhookJob < Postal::Job
         begin
           new_items[::Regexp.last_match(1)] = server.message_db.message(value.to_i).webhook_hash
         rescue Postal::MessageDB::Message::NotFound
+          # No message found, don't do any replacement
         end
       end