diff --git a/src/protect/babymonitor/MonitorActivity.java b/src/protect/babymonitor/MonitorActivity.java
index ba41b1f..ac5a2e4 100644
--- a/src/protect/babymonitor/MonitorActivity.java
+++ b/src/protect/babymonitor/MonitorActivity.java
@@ -152,13 +152,7 @@ public class MonitorActivity extends Activity
     {
         Log.i(TAG, "Baby monitor stop");
 
-        if(_registrationListener != null)
-        {
-            Log.i(TAG, "Unregistering monitoring service");
-
-            _nsdManager.unregisterService(_registrationListener);
-            _registrationListener = null;
-        }
+        unregisterService();
 
         if(_serviceThread != null)
         {
@@ -249,4 +243,19 @@ public class MonitorActivity extends Activity
         _nsdManager.registerService(
                 serviceInfo, NsdManager.PROTOCOL_DNS_SD, _registrationListener);
     }
+
+    /**
+     * Uhregistered the service and assigns the listener
+     * to null.
+     */
+    void unregisterService()
+    {
+        if(_registrationListener != null)
+        {
+            Log.i(TAG, "Unregistering monitoring service");
+
+            _nsdManager.unregisterService(_registrationListener);
+            _registrationListener = null;
+        }
+    }
 }