diff --git a/app/Handlers/Events/UserConfirmation.php b/app/Handlers/Events/UserConfirmation.php
index 8b3e8f86c1..536e9ed671 100644
--- a/app/Handlers/Events/UserConfirmation.php
+++ b/app/Handlers/Events/UserConfirmation.php
@@ -10,6 +10,7 @@
 namespace FireflyIII\Handlers\Events;
 
 
+use Exception;
 use FireflyIII\Events\ResendConfirmation;
 use FireflyIII\Events\UserRegistration;
 use FireflyIII\User;
@@ -67,9 +68,10 @@ class UserConfirmation
 
         // if user must confirm account, send email
         $confirmAccount = env('MUST_CONFIRM_ACCOUNT', false);
-    
+
         // otherwise, auto-confirm:
         if ($confirmAccount === false) {
+            Log::debug('Confirm account is false, so user will be auto-confirmed.');
             Preferences::setForUser($user, 'user_confirmed', true);
             Preferences::setForUser($user, 'user_confirmed_last_mail', 0);
             Preferences::mark();
@@ -86,9 +88,11 @@ class UserConfirmation
         Preferences::setForUser($user, 'user_confirmed', false);
         Preferences::setForUser($user, 'user_confirmed_last_mail', time());
         Preferences::setForUser($user, 'user_confirmed_code', $code);
+        Log::debug('Set preferences for user.');
 
         // send email.
         try {
+            Log::debug('Now in try block for user email message thing to ' . $email . '.');
             Mail::send(
                 ['emails.confirm-account-html', 'emails.confirm-account'], ['route' => $route, 'ip' => $ipAddress],
                 function (Message $message) use ($email) {
@@ -96,8 +100,15 @@ class UserConfirmation
                 }
             );
         } catch (Swift_TransportException $e) {
+
+            Log::error($e->getMessage());
+        } catch (Exception $e) {
+            Log::debug('Caught general exception.');
             Log::error($e->getMessage());
         }
+        Log::debug('Finished mail handling for activation.');
+
+        return;
     }
 
 }
\ No newline at end of file