diff --git a/lib/versions.js b/lib/versions.js
index 9914971be..972a86ccc 100644
--- a/lib/versions.js
+++ b/lib/versions.js
@@ -158,16 +158,13 @@ module.exports = {
     getVersion: function(args){
         return (isLegacyVersion(args.desiredVersion) ? getLegacyVersions : getVersionsFromManifest)(args.downloadUrl)
             .then(function(versions) {
-                var version = versions.find(function(version){
-                    if(version.version === args.desiredVersion) {
-                        return version;
-                    }
+                var version = versions.findIndex(function(version){
+                    return version.version === args.desiredVersion;
                 });
 
-                if(version){
-                    return version;
-                }
-                throw new Error('Version ' + args.desiredVersion + ' not found.');
+                return version >= 0
+                    ? Promise.resolve(versions[version])
+                    : Promise.reject('Version ' + args.desiredVersion + ' not found.');
             });
     },
     /**