From fd2fe9ebd7f4be96a6e9eef261f66931bb9747ad Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Mon, 22 Jun 2015 18:03:58 -0700
Subject: [PATCH] Fix for plaintext SMS import NPE.

// FREEBIE
---
 .../securesms/service/ApplicationMigrationService.java    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/service/ApplicationMigrationService.java b/src/org/thoughtcrime/securesms/service/ApplicationMigrationService.java
index 03b3a149c0..2410cf1d3d 100644
--- a/src/org/thoughtcrime/securesms/service/ApplicationMigrationService.java
+++ b/src/org/thoughtcrime/securesms/service/ApplicationMigrationService.java
@@ -105,10 +105,12 @@ public class ApplicationMigrationService extends Service
   private void setState(ImportState state) {
     this.state = state;
 
-    Handler handler = this.handler.get();
+    if (this.handler != null) {
+      Handler handler = this.handler.get();
 
-    if (handler != null) {
-      handler.obtainMessage(state.state, state.progress).sendToTarget();
+      if (handler != null) {
+        handler.obtainMessage(state.state, state.progress).sendToTarget();
+      }
     }
 
     if (state.progress != null && state.progress.secondaryComplete == 0) {