diff --git a/app/src/main/java/com/emanuelef/remote_capture/fragments/ConnectionsFragment.java b/app/src/main/java/com/emanuelef/remote_capture/fragments/ConnectionsFragment.java
index d156eddb..a1fdb7a5 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/fragments/ConnectionsFragment.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/fragments/ConnectionsFragment.java
@@ -118,8 +118,10 @@ public class ConnectionsFragment extends Fragment implements ConnectionsListener
     public void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
 
-        outState.putString("filter", mSearchView.getQuery().toString());
-        outState.putBoolean("whitelistEnabled", mAdapter.mWhitelistEnabled);
+        if(mSearchView != null)
+            outState.putString("filter", mSearchView.getQuery().toString());
+        if(mAdapter != null)
+            outState.putBoolean("whitelistEnabled", mAdapter.mWhitelistEnabled);
     }
 
     @Override