diff --git a/app/Http/Controllers/Auth/ContactRegisterController.php b/app/Http/Controllers/Auth/ContactRegisterController.php
index 51bc35739ffe..6ef9b17ee108 100644
--- a/app/Http/Controllers/Auth/ContactRegisterController.php
+++ b/app/Http/Controllers/Auth/ContactRegisterController.php
@@ -65,7 +65,9 @@ class ContactRegisterController extends Controller
 
         $client_contact->client_id = $client->id;
         $client_contact->is_primary = true;
-        $client_contact->password = Hash::make($data['password']);
+
+        if(array_key_exists('password', $data))
+            $client_contact->password = Hash::make($data['password']);
 
         $client_contact->save();
 
diff --git a/app/PaymentDrivers/BaseDriver.php b/app/PaymentDrivers/BaseDriver.php
index 9b8d2ca04a12..504679626341 100644
--- a/app/PaymentDrivers/BaseDriver.php
+++ b/app/PaymentDrivers/BaseDriver.php
@@ -386,6 +386,9 @@ class BaseDriver extends AbstractPaymentDriver
         } else
             $error = $e->getMessage();
 
+        if(!$this->payment_hash)
+            throw new PaymentFailed($error, $e->getCode());
+
         $amount = array_sum(array_column($this->payment_hash->invoices(), 'amount')) + $this->payment_hash->fee_total;
 
         $this->sendFailureMail($error);