diff --git a/TangoRosStreamer/app/src/main/java/eu/intermodalics/tango_ros_streamer/activities/RunningActivity.java b/TangoRosStreamer/app/src/main/java/eu/intermodalics/tango_ros_streamer/activities/RunningActivity.java
index d305bd2..60b2308 100644
--- a/TangoRosStreamer/app/src/main/java/eu/intermodalics/tango_ros_streamer/activities/RunningActivity.java
+++ b/TangoRosStreamer/app/src/main/java/eu/intermodalics/tango_ros_streamer/activities/RunningActivity.java
@@ -209,6 +209,7 @@ public void run() {
                             new View.OnClickListener() {
                                 @Override
                                 public void onClick(View view) {
+                                    mRunLocalMaster = mSharedPref.getBoolean(getString(R.string.pref_master_is_local_key), false);
                                     mMasterUri = mSharedPref.getString(getString(R.string.pref_master_uri_key),
                                             getResources().getString(R.string.pref_master_uri_default));
                                     mUriTextView.setText(mMasterUri);
@@ -721,7 +722,7 @@ public void onShutdown(NodeMainExecutorService nodeMainExecutorService) {
             // e.g. 'http://android-c90553518bc67cf5:1131'.
             // Instead of showing this to the user, we show the IP address of the device,
             // which is also correct and less confusing.
-            WifiManager wifiManager = (WifiManager) getSystemService(WIFI_SERVICE);
+            WifiManager wifiManager = (WifiManager) getApplicationContext().getSystemService(WIFI_SERVICE);
             String deviceIP = Formatter.formatIpAddress(wifiManager.getConnectionInfo().getIpAddress());
             mUriTextView = (TextView) findViewById(R.id.master_uri);
             mUriTextView.setText("http://" + deviceIP + ":11311");