diff --git a/wrappers/android/tools/camera/src/main/java/com/intel/realsense/camera/DetachedActivity.java b/wrappers/android/tools/camera/src/main/java/com/intel/realsense/camera/DetachedActivity.java
index 67771750f5..c6abd48400 100644
--- a/wrappers/android/tools/camera/src/main/java/com/intel/realsense/camera/DetachedActivity.java
+++ b/wrappers/android/tools/camera/src/main/java/com/intel/realsense/camera/DetachedActivity.java
@@ -35,12 +35,11 @@ public class DetachedActivity extends AppCompatActivity {
     private boolean mPermissionsGrunted = false;
     private Button mPlaybackButton;
 
+    private Context mAppContext;
     private RsContext mRsContext = new RsContext();
-    ;
 
     private Map<ProductLine,String> mMinimalFirmwares = new HashMap<>();
     private boolean mUpdating = false;
-    private Context mAppContext;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -64,10 +63,15 @@ public void onClick(View view) {
             return;
         }
 
-        String appVersion = BuildConfig.VERSION_NAME;
-        String lrsVersion = RsContext.getVersion();
-        TextView versions = findViewById(R.id.versionsText);
-        versions.setText("librealsense version: " + lrsVersion + "\ncamera app version: " + appVersion);
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                String appVersion = BuildConfig.VERSION_NAME;
+                String lrsVersion = RsContext.getVersion();
+                TextView versions = findViewById(R.id.versionsText);
+                versions.setText("librealsense version: " + lrsVersion + "\ncamera app version: " + appVersion);
+            }
+        });
 
         mMinimalFirmwares.put(ProductLine.D400, MINIMAL_D400_FW_VERSION);
 
@@ -88,8 +92,7 @@ public void onRequestPermissionsResult(int requestCode, String permissions[], in
     protected void onResume() {
         super.onResume();
 
-        if(mPermissionsGrunted)
-        {
+        if(mPermissionsGrunted) {
             RsContext.init(getApplicationContext());
             mRsContext.setDevicesChangedCallback(mListener);
             validatedDevice();
@@ -183,9 +186,9 @@ public void onDeviceAttach() {
 
         @Override
         public void onDeviceDetach() {
+            finish();
             Intent intent = new Intent(mAppContext, DetachedActivity.class);
             startActivity(intent);
-            finish();
         }
     };
 }
diff --git a/wrappers/android/tools/camera/src/main/java/com/intel/realsense/camera/FirmwareUpdateDialog.java b/wrappers/android/tools/camera/src/main/java/com/intel/realsense/camera/FirmwareUpdateDialog.java
index f7e89d9bc7..87c976cacf 100644
--- a/wrappers/android/tools/camera/src/main/java/com/intel/realsense/camera/FirmwareUpdateDialog.java
+++ b/wrappers/android/tools/camera/src/main/java/com/intel/realsense/camera/FirmwareUpdateDialog.java
@@ -86,8 +86,6 @@ public void onClick(View view) {
                     try(Device d = dl.createDevice(0)){
                         if(d.is(Extension.UPDATABLE))
                             d.<Updatable>as(Extension.UPDATABLE).enterUpdateState();
-                        else
-                            throw new RuntimeException("request to update a non updatable device");
                     }
                 }
             }