diff --git a/app/Jobs/Mail/NinjaMailerJob.php b/app/Jobs/Mail/NinjaMailerJob.php
index ceb8d107e0dc..f7bcf5a8f326 100644
--- a/app/Jobs/Mail/NinjaMailerJob.php
+++ b/app/Jobs/Mail/NinjaMailerJob.php
@@ -206,11 +206,11 @@ class NinjaMailerJob implements ShouldQueue
                     app('sentry')->captureException($e);
 
             }
-    
-        }
+        
+            /* Releasing immediately does not add in the backoff */
+            $this->release($this->backoff()[$this->attempts()-1]);
 
-        /* Releasing immediately does not add in the backoff */
-        $this->release($this->backoff()[$this->attempts()-1]);
+        }
 
         /*Clean up mailers*/ 
         $this->cleanUpMailers();
@@ -649,7 +649,8 @@ class NinjaMailerJob implements ShouldQueue
 
     public function failed($exception = null)
     {
-        
+        if($exception)
+            nlog($exception->getMessage());
     }
 
 }
\ No newline at end of file
diff --git a/app/Services/Email/EmailMailer.php b/app/Services/Email/EmailMailer.php
index 4c8efee5098a..897c69d2a6b3 100644
--- a/app/Services/Email/EmailMailer.php
+++ b/app/Services/Email/EmailMailer.php
@@ -141,10 +141,12 @@ class EmailMailer implements ShouldQueue
             $this->release($this->backoff()[$this->attempts()-1]);
 
             $message = null;
-            $this->cleanUpMailers();
+            
 
         }
 
+        $this->cleanUpMailers();
+
     }
 
     /**