--- a/setup/src/Setup/DbUtil.php
+++ b/setup/src/Setup/DbUtil.php
@@ -219,7 +219,7 @@
             }
           }
           else {
-            throw new SqlException("Cannot execute $query: " . mysqli_error($conn));
+            throw new SqlException("Cannot execute SQL: " . mysqli_error($conn) . "; SQL: $query");
           }
         }
       }
@@ -259,7 +259,7 @@
     $conn = is_array($conn) ? self::connect($conn) : $conn;
     $result = $conn->query($sql);
     if (!$result) {
-      throw new SqlException("Cannot execute $sql: " . $conn->error);
+      throw new SqlException("Cannot execute SQL: " . $conn->error . "; SQL: $sql");
     }
 
     if ($result && $result !== TRUE) {
@@ -282,7 +282,7 @@
     $conn = is_array($conn) ? self::connect($conn) : $conn;
     $result = $conn->query($sql);
     if (!$result) {
-      throw new SqlException("Cannot execute $sql: " . $conn->error);
+      throw new SqlException("Cannot execute SQL: " . $conn->error . "; SQL: $sql");
     }
 
     $rows = [];