diff --git a/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderServiceSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderServiceSipImpl.java
index 74c83ac95..51f02dd04 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderServiceSipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderServiceSipImpl.java
@@ -1081,6 +1081,12 @@ public void shutdown()
         {
             return;
         }
+        logger.trace("Killing the SIP Protocol Provider.");
+        //kill all active calls
+        OperationSetBasicTelephonySipImpl telephony
+            = (OperationSetBasicTelephonySipImpl)getOperationSet(
+                OperationSetBasicTelephony.class);
+        telephony.shutdown();
 
         if(isRegistered())
         {
@@ -1553,6 +1559,9 @@ private void initRegistrarConnection(AccountID accountID)
                 + registrarAddress.getHostAddress() + ": "
                 + ex.getMessage());
         }
+
+        //initialize our OPTIONS handler
+        ClientCapabilities capabilities = new ClientCapabilities(this);
     }
 
     /**
@@ -1854,4 +1863,13 @@ public void attachToTag(Response response, Dialog containingDialog)
         }
     }
 
+    /**
+     * Returns a List of Strings corresponding to all methods that we have a
+     * processor for.
+     * @return a List of methods that we support.
+     */
+    public List getSupportedMethods()
+    {
+        return new ArrayList(methodProcessors.keySet());
+    }
 }