diff --git a/src/main/java/org/thoughtcrime/securesms/qr/QrScanFragment.java b/src/main/java/org/thoughtcrime/securesms/qr/QrScanFragment.java
index eed80928b..e8d70d0e4 100644
--- a/src/main/java/org/thoughtcrime/securesms/qr/QrScanFragment.java
+++ b/src/main/java/org/thoughtcrime/securesms/qr/QrScanFragment.java
@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.qr;
 
 import android.app.Activity;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -107,8 +108,8 @@ public class QrScanFragment extends Fragment {
         // therefore, we only show a non-disturbing error here.
         @Override
         protected void displayFrameworkBugMessageAndExit(String message) {
-            if (message == null || message.isEmpty()) {
-                message = activity.getString(R.string.zxing_msg_camera_framework_bug);
+            if (TextUtils.isEmpty(message)) {
+                message = myActivity.getString(R.string.zxing_msg_camera_framework_bug);
             }
             Toast.makeText(myActivity, message, Toast.LENGTH_SHORT).show();
         }