diff --git a/lib/private/Repair.php b/lib/private/Repair.php
index 1fe332cf1e2..50c12232f05 100644
--- a/lib/private/Repair.php
+++ b/lib/private/Repair.php
@@ -79,6 +79,7 @@ use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\GenericEvent;
+use Throwable;
 
 class Repair implements IOutput {
 
@@ -131,7 +132,13 @@ class Repair implements IOutput {
 				$s = \OC::$server->query($repairStep);
 			} catch (QueryException $e) {
 				if (class_exists($repairStep)) {
-					$s = new $repairStep();
+					try {
+						// Last resort: hope there are no constructor arguments
+						$s = new $repairStep();
+					} catch (Throwable $inner) {
+						// Well, it was worth a try
+						throw new \Exception("Repair step '$repairStep' can't be instantiated: " . $e->getMessage(), 0, $e);
+					}
 				} else {
 					throw new \Exception("Repair step '$repairStep' is unknown");
 				}