diff --git a/models/RecoveryForm.php b/models/RecoveryForm.php
index ca13f7926..e28c05424 100644
--- a/models/RecoveryForm.php
+++ b/models/RecoveryForm.php
@@ -115,9 +115,18 @@ public function sendRecoveryMessage()
                 'user_id' => $this->user->id,
                 'type'    => Token::TYPE_RECOVERY,
             ]);
-            $token->save(false);
-            $this->mailer->sendRecoveryMessage($this->user, $token);
-            Yii::$app->session->setFlash('info', Yii::t('user', 'An email has been sent with instructions for resetting your password'));
+
+            if (!$token->save(false)) {
+                return false;
+            }
+
+            if (!$this->mailer->sendRecoveryMessage($this->user, $token)) {
+                return false;
+            }
+
+            Yii::$app->session->setFlash('info',
+                Yii::t('user', 'An email has been sent with instructions for resetting your password')
+            );
 
             return true;
         }