diff --git a/docker_dns.py b/docker_dns.py
index 6466b1a..c072ccc 100755
--- a/docker_dns.py
+++ b/docker_dns.py
@@ -118,12 +118,12 @@ def lookup_container(self, name):
         except docker.client.APIError as ex:
             # 404 is valid, others aren't
             if ex.response.status_code != 404:
-                warn(ex)
+                warn(str(ex))
 
             return None
 
         except RequestException as ex:
-            warn(ex)
+            warn(str(ex))
             return None
 
     def get_a(self, name):
@@ -197,7 +197,10 @@ def lookupAddress(self, name, timeout=None):
 
         # We need to catch everything. Uncaught exceptian will make the server
         # stop responding
-        except:  # pylint:disable=bare-except
+        except Exception, e:  # pylint:disable=bare-except
+            if type(e) != DomainError:
+                import traceback
+                traceback.print_exc()
             if CONFIG['no_nxdomain']:
                 # FIXME surely there's a better way to give SERVFAIL
                 exception = DNSQueryTimeoutError(name)