diff --git a/lib/analyze/webpagetest.js b/lib/analyze/webpagetest.js
index 9ac989be3..4f90408d1 100644
--- a/lib/analyze/webpagetest.js
+++ b/lib/analyze/webpagetest.js
@@ -79,6 +79,13 @@ function analyzeUrl(args, asyncDoneCallback) {
 
   wpt.runTest(url, wptOptions, function(err, data) {
 
+    if (err) {
+      log.log('error', "WebPageTest couldn't fetch info for url " + url + '(' +
+        JSON.stringify(err) + ')');
+      asyncDoneCallback(undefined, err);
+      return;
+    }
+
     var id = data.response.data.testId;
 
     /*
@@ -105,13 +112,6 @@ function analyzeUrl(args, asyncDoneCallback) {
     */
 
 
-    // TODO check for err
-    if (err) {
-      log.log('error', "WebPageTest couldn't fetch info for url " + url + '(' +
-        JSON.stringify(err) + ')');
-      asyncDoneCallback(undefined, err);
-      return;
-    }
     var jsonPath = path.join(config.run.absResultDir, config.dataDir,
       'webpagetest',
       util.getUrlHash(url) + '-webpagetest.json');