diff --git a/src/install.js b/src/install.js
index a06a138f26..e3abfdca2f 100644
--- a/src/install.js
+++ b/src/install.js
@@ -507,12 +507,11 @@ install.setup = function (callback) {
 		setCopyrightWidget,
 		function (next) {
 			var upgrade = require('./upgrade');
-			upgrade.check(function (err, uptodate) {
-				if (err) {
+			upgrade.check(function (err) {
+				if (err && err.message === 'schema-out-of-date') {
+					upgrade.run(next);
+				} else if (err) {
 					return next(err);
-				}
-				if (!uptodate) {
-					upgrade.upgrade(next);
 				} else {
 					next();
 				}