diff --git a/app/src/main/java/io/pslab/activity/MainActivity.java b/app/src/main/java/io/pslab/activity/MainActivity.java
index bfae90792..a15250bea 100644
--- a/app/src/main/java/io/pslab/activity/MainActivity.java
+++ b/app/src/main/java/io/pslab/activity/MainActivity.java
@@ -104,7 +104,6 @@ public class MainActivity extends AppCompatActivity {
     private PendingIntent mPermissionIntent;
     private CommunicationHandler communicationHandler;
     private USBDetachReceiver usbDetachReceiver;
-    private WifiDisconnectReceiver wifiDisconnectReceiver;
     private static final String ACTION_USB_PERMISSION = "com.android.example.USB_PERMISSION";
     private static final int TIME_INTERVAL = 2000;
     private long mBackPressed;
@@ -142,7 +141,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         IntentFilter wifiDisconnectFilter = new IntentFilter();
         wifiDisconnectFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
-        wifiDisconnectReceiver = new WifiDisconnectReceiver(this);
+        WifiDisconnectReceiver wifiDisconnectReceiver = new WifiDisconnectReceiver(this);
         registerReceiver(wifiDisconnectReceiver, wifiDisconnectFilter);
 
         setSupportActionBar(toolbar);
diff --git a/app/src/main/java/io/pslab/communication/PacketHandler.java b/app/src/main/java/io/pslab/communication/PacketHandler.java
index 28d8b096d..e02eca98c 100644
--- a/app/src/main/java/io/pslab/communication/PacketHandler.java
+++ b/app/src/main/java/io/pslab/communication/PacketHandler.java
@@ -299,8 +299,8 @@ public void close() {
             } else {
                 socketClient.closeConnection();
             }
-        } catch (IOException e) {
-            throw new RuntimeException(e);
+        } catch (Exception e) {
+            Log.e(TAG, "Error closing connection");
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index ebbd05fff..4ff562cbe 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -271,7 +271,6 @@
     <dimen name="separator_margin_top">30dp</dimen>
     <dimen name="separator_width">1dp</dimen>
     <dimen name="device_status_margin_bottom">40dp</dimen>
-    <dimen name="device_status_margin_top">20dp</dimen>
     <dimen name="connect_inst_margin_b0ttom">20dp</dimen>
     <dimen name="device_status_height_text">60dp</dimen>
     <dimen name="progress_bar_height">8dp</dimen>