diff --git a/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt
index 6009e383..ec222ec1 100644
--- a/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt
@@ -52,7 +52,7 @@ class BackupRepositoryImpl @Inject constructor(
     }
 
     data class Backup(
-            val messages: List<BackupMessage>
+            val messages: List<BackupMessage> = listOf()
     )
 
     data class BackupMessage(
diff --git a/data/src/main/java/com/moez/QKSMS/service/RestoreBackupService.kt b/data/src/main/java/com/moez/QKSMS/service/RestoreBackupService.kt
index cffeb588..efcd3dad 100644
--- a/data/src/main/java/com/moez/QKSMS/service/RestoreBackupService.kt
+++ b/data/src/main/java/com/moez/QKSMS/service/RestoreBackupService.kt
@@ -30,6 +30,7 @@ import com.moez.QKSMS.repository.BackupRepository
 import dagger.android.AndroidInjection
 import io.reactivex.Observable
 import io.reactivex.schedulers.Schedulers
+import timber.log.Timber
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
@@ -96,8 +97,9 @@ class RestoreBackupService : Service() {
         // Start the restore
         Observable.just(intent)
                 .map { it.getStringExtra(EXTRA_FILE_PATH) }
+                .map(backupRepo::performRestore)
                 .subscribeOn(Schedulers.io())
-                .subscribe(backupRepo::performRestore)
+                .subscribe({}, Timber::w)
     }
 
     private fun stop() {