diff --git a/app/Http/Controllers/SelfUpdateController.php b/app/Http/Controllers/SelfUpdateController.php
index bfa265cdd261..a50e553b9a3d 100644
--- a/app/Http/Controllers/SelfUpdateController.php
+++ b/app/Http/Controllers/SelfUpdateController.php
@@ -79,6 +79,8 @@ class SelfUpdateController extends BaseController
         }
         catch(GitException $e) {
             info($e->getMessage());
+            return response()->json(['message'=>$e->getMessage()], 500);
+
         }
         info("Are there any changes to pull? " . $repo->hasChanges());
 
diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php
index 4f7de793674a..f353f22276f2 100644
--- a/app/Jobs/Util/Import.php
+++ b/app/Jobs/Util/Import.php
@@ -392,6 +392,8 @@ class Import implements ShouldQueue
                 )
             );
 
+            $client->contacts()->forceDelete();
+
             if (array_key_exists('contacts', $resource)) { // need to remove after importing new migration.json
                 $modified_contacts = $resource['contacts'];
 
@@ -403,9 +405,11 @@ class Import implements ShouldQueue
                     unset($modified_contacts[$key]['id']);
                 }
 
+
                 $saveable_contacts['contacts'] = $modified_contacts;
 
                 $contact_repository->save($saveable_contacts, $client);
+
             }
 
             $key = "clients_{$resource['id']}";