diff --git a/core/command/upgrade.php b/core/command/upgrade.php
index 7f03769a6098d70eb7e6068b09fa06f9e2eb0ca5..03976e59bd8f921fdabee25f07a312cee2c6946a 100644
--- a/core/command/upgrade.php
+++ b/core/command/upgrade.php
@@ -72,20 +72,18 @@ class Upgrade extends Command {
 
 			$updater->upgrade();
 			return self::ERROR_SUCCESS;
+		} else if(\OC_Config::getValue('maintenance', false)) {
+			//Possible scenario: ownCloud core is updated but an app failed
+			$output->writeln('ownCloud is in maintenance mode');
+			$output->write('Maybe an upgrade is already in process. Please check the '
+				. 'logfile (data/owncloud.log). If you want to re-run the '
+				. 'upgrade procedure, remove the "maintenance mode" from '
+				. 'config.php and call this script again.'
+				, true);
+			return self::ERROR_MAINTENANCE_MODE;
 		} else {
-			if(\OC_Config::getValue('maintenance', false)) {
-				//Possible scenario: ownCloud core is updated but an app failed
-				$output->writeln('ownCloud is in maintenance mode');
-				$output->write('Maybe an upgrade is already in process. Please check the '
-					. 'logfile (data/owncloud.log). If you want to re-run the '
-					. 'upgrade procedure, remove the "maintenance mode" from '
-					. 'config.php and call this script again.'
-					, true);
-				return self::ERROR_MAINTENANCE_MODE;
-			} else {
-				$output->writeln('ownCloud is already latest version');
-				return self::ERROR_UP_TO_DATE;
-			}
+			$output->writeln('ownCloud is already latest version');
+			return self::ERROR_UP_TO_DATE;
 		}
 	}
 }