diff --git a/src/net/java/sip/communicator/impl/media/MediaActivator.java b/src/net/java/sip/communicator/impl/media/MediaActivator.java
index 43c3b2ad1..faf2fcf21 100644
--- a/src/net/java/sip/communicator/impl/media/MediaActivator.java
+++ b/src/net/java/sip/communicator/impl/media/MediaActivator.java
@@ -176,8 +176,16 @@ public static BundleContext getBundleContext()
     public void stop(BundleContext context)
         throws Exception
     {
-        mediaServiceImpl.stop();
-        mediaServiceRegistration.unregister();
+        if (mediaServiceImpl != null)
+        {
+            mediaServiceImpl.stop();
+            mediaServiceImpl = null;
+        }
+        if (mediaServiceRegistration != null)
+        {
+            mediaServiceRegistration.unregister();
+            mediaServiceRegistration = null;
+        }
     }
 
 }