componentjs
diff --git a/‎lib/remote.js
Copy file name to clipboardExpand all lines: lib/remote.js
+11-8Lines changed: 11 additions & 8 deletions b/‎lib/remote.js
Copy file name to clipboardExpand all lines: lib/remote.js
+11-8Lines changed: 11 additions & 8 deletions
diff --git a/‎test/bitbucket.js
Copy file name to clipboardExpand all lines: test/bitbucket.js
+2-6Lines changed: 2 additions & 6 deletions b/‎test/bitbucket.js
Copy file name to clipboardExpand all lines: test/bitbucket.js
+2-6Lines changed: 2 additions & 6 deletions
diff --git a/‎test/github.js
Copy file name to clipboardExpand all lines: test/github.js
+2-6Lines changed: 2 additions & 6 deletions b/‎test/github.js
Copy file name to clipboardExpand all lines: test/github.js
+2-6Lines changed: 2 additions & 6 deletions
diff --git a/‎test/remotes.js
Copy file name to clipboardExpand all lines: test/remotes.js
+1-1Lines changed: 1 addition & 1 deletion b/‎test/remotes.js
Copy file name to clipboardExpand all lines: test/remotes.js
+1-1Lines changed: 1 addition & 1 deletion
@@ -86,13 +86,10 @@ Remote.prototype.resolve = function* (remotes, repo, ref) {
     return;
   }
   // use latest tag, and if it's not available, then master
-  var availableVersions = [];
-  try {
-    availableVersions = yield* this.versions(repo);
-  } catch (err) { // no tags available, then try master branch
-  } 
-  if (availableVersions.length === 0) {
-    availableVersions.push('master');
+  var availableVersions = yield* this.versions(repo);
+
+  if (availableVersions == null) {
+    availableVersions = ['master'];
   }
   var json = yield* this.json(repo, ref || availableVersions[0]);
   if (json) return this;
@@ -119,7 +116,13 @@ Remote.prototype.versions = function* (repo) {
       : cache[repo];
 
   cache[repo] = 'resolving';
-  var references = yield* this._versions(repo);
+  var references;
+  try {
+    references = yield* this._versions(repo);
+  } catch (err) {
+    // catch 404 and non 200 status codes
+    // references = undefined
+  }
   var versions = cache[repo] = references
     ? references.filter(valid).sort(semver.rcompare)
     : null;
 
@@ -42,12 +42,8 @@ describe('BitBucket Remote', function () {
     }))
 
     it('should throw if the repository doesn\'t exist', co(function* () {
-      try {
-        yield* remote.versions('netpoetica/component-easterbunny');
-        throw new Error();
-      } catch (err) {
-        err.message.should.include('check that this repository still exists');
-      }
+      var res = yield* remote.versions('netpoetica/component-easterbunny');
+      (res == null).should.true;
     }))
   })
 
 
@@ -45,12 +45,8 @@ describe('GitHub Remote', function () {
     }))
 
     it('throw if the repository doesn\'t exist', co(function* () {
-      try {
-        yield* remote.versions('jonathanong/alisudhlsdiuh');
-        throw new Error();
-      } catch (err) {
-        err.message.should.include('check that this repository still exists');
-      }
+      var res = yield* remote.versions('jonathanong/alisudhlsdiuh');
+      (res == null).should.true;
     }))
   })
 
 
@@ -89,7 +89,7 @@ describe('Remotes', function () {
     })
 
     // this test fails in combination with the other tests, .only works!
-    describe.skip('FIXME: when no remote matches', function () {
+    describe('when no remote matches', function () {
       it('should return null', co(function* () {
         var r = yield* remote.resolve('kljalsdkfjlaksjdflkajsdf')
         assert.ok(!r)