diff --git a/client.js b/client.js
index 1d147765..1912e6c7 100644
--- a/client.js
+++ b/client.js
@@ -300,7 +300,7 @@ Tracker.prototype._requestUdp = function (requestUrl, opts) {
     if (!stopped) {
       error('tracker request timed out')
     }
-  }, stopped ? 1500 : 15000)
+  }, stopped ? 1500 : 2000)
 
   if (timeout && timeout.unref) {
     timeout.unref()
@@ -461,13 +461,13 @@ Tracker.prototype._handleResponse = function (requestUrl, data) {
   var failure = data['failure reason']
   if (failure) {
     debug('failure from ' + requestUrl + ' (' + failure + ')')
-    return self.client.emit('warning', new Error(failure))
+    return self.client.emit('warning', new Error(failure + ' (' + requestUrl + ')'))
   }
 
   var warning = data['warning message']
   if (warning) {
     debug('warning from ' + requestUrl + ' (' + warning + ')')
-    self.client.emit('warning', new Error(warning))
+    self.client.emit('warning', new Error(warning + ' (' + requestUrl + ')'))
   }
 
   debug('response from ' + requestUrl)