diff --git a/lib/felix.client.run.properties b/lib/felix.client.run.properties
index 81a6ddc3b..dca0eae71 100644
--- a/lib/felix.client.run.properties
+++ b/lib/felix.client.run.properties
@@ -19,6 +19,7 @@ org.osgi.framework.system.packages.extra= \
  sun.awt.shell; \
  sun.misc; \
  sun.net.util; \
+ sun.net.dns; \
  sun.security.action;
 
 felix.auto.start.10= \
diff --git a/lib/felix.unit.test.properties b/lib/felix.unit.test.properties
index 7d6585bb5..e74dd349c 100644
--- a/lib/felix.unit.test.properties
+++ b/lib/felix.unit.test.properties
@@ -25,6 +25,7 @@ org.osgi.framework.system.packages.extra= \
  sun.awt.shell; \
  sun.misc; \
  sun.net.util; \
+ sun.net.dns; \
  sun.security.action;
 
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java
index da260fad6..0964008db 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java
@@ -2097,16 +2097,25 @@ public void cancelActiveFileTransfers()
 
         while (activeKeys.hasMoreElements())
         {
-            String key = activeKeys.nextElement();
-            Object descriptor = activeFileTransfers.get(key);
-
-            if (descriptor instanceof IncomingFileTransferRequest)
+            // catchall so if anything happens we still
+            // will close the chat/window
+            try
             {
-                ((IncomingFileTransferRequest) descriptor).rejectFile();
+                String key = activeKeys.nextElement();
+                Object descriptor = activeFileTransfers.get(key);
+
+                if (descriptor instanceof IncomingFileTransferRequest)
+                {
+                    ((IncomingFileTransferRequest) descriptor).rejectFile();
+                }
+                else if (descriptor instanceof FileTransfer)
+                {
+                    ((FileTransfer) descriptor).cancel();
+                }
             }
-            else if (descriptor instanceof FileTransfer)
+            catch(Throwable t)
             {
-                ((FileTransfer) descriptor).cancel();
+                logger.error("Cannot cancel file transfer.", t);
             }
         }
     }
diff --git a/src/net/java/sip/communicator/util/util.manifest.mf b/src/net/java/sip/communicator/util/util.manifest.mf
index 5141c4651..03cfda1b6 100644
--- a/src/net/java/sip/communicator/util/util.manifest.mf
+++ b/src/net/java/sip/communicator/util/util.manifest.mf
@@ -32,7 +32,8 @@ Import-Package: org.xml.sax,
  net.java.sip.communicator.service.configuration,
  net.java.sip.communicator.service.contactlist,
  sun.awt.shell,
- sun.net.util
+ sun.net.util,
+ sun.net.dns
 Export-Package: net.java.sip.communicator.util.xml,
  net.java.sip.communicator.util.swing.plaf,
  net.java.sip.communicator.util.swing.event,