diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index d067d0c94a..4855a4c490 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -10639,11 +10639,14 @@ if ( CheckVersion($DBversion) ) {
 
 $DBversion = "3.21.00.009";
 if ( CheckVersion($DBversion) ) {
-    $dbh->do(q|
-        UPDATE aqorders SET orderstatus='cancelled'
-        WHERE (datecancellationprinted IS NOT NULL OR
-               datecancellationprinted<>'0000-00-00');
-    |);
+    eval {
+        local $dbh->{PrintError} = 0;
+        $dbh->do(q|
+            UPDATE aqorders SET orderstatus='cancelled'
+            WHERE (datecancellationprinted IS NOT NULL OR
+                   datecancellationprinted<>'0000-00-00');
+        |);
+    };
     print "Upgrade to $DBversion done (Bug 13993: Correct orderstatus for transferred orders)\n";
     SetVersion($DBversion);
 }
@@ -10874,18 +10877,22 @@ if ( CheckVersion($DBversion) ) {
 
 $DBversion = "3.21.00.023";
 if ( CheckVersion($DBversion) ) {
-    $dbh->do(q{
-        UPDATE borrowers SET debarred=NULL WHERE debarred='0000-00-00'
-    });
-    $dbh->do(q{
-        UPDATE borrowers SET dateexpiry=NULL where dateexpiry='0000-00-00'
-    });
-    $dbh->do(q{
-        UPDATE borrowers SET dateofbirth=NULL where dateofbirth='0000-00-00'
-    });
-    $dbh->do(q{
-        UPDATE borrowers SET dateenrolled=NULL where dateenrolled='0000-00-00'
-    });
+    eval {
+        local $dbh->{PrintError} = 0;
+        $dbh->do(q{
+            UPDATE borrowers SET debarred=NULL WHERE debarred='0000-00-00'
+        });
+        $dbh->do(q{
+            UPDATE borrowers SET dateexpiry=NULL where dateexpiry='0000-00-00'
+        });
+        $dbh->do(q{
+            UPDATE borrowers SET dateofbirth=NULL where dateofbirth='0000-00-00'
+        });
+        $dbh->do(q{
+            UPDATE borrowers SET dateenrolled=NULL where dateenrolled='0000-00-00'
+        });
+    };
+
     print "Upgrade to $DBversion done (Bug 14717: Prevent 0000-00-00 dates in patron data)\n";
     SetVersion($DBversion);
 }
@@ -17633,15 +17640,18 @@ $DBversion = '18.12.00.024';
 if ( CheckVersion($DBversion) ) {
 
     # Fixup any pre-existing bad suggestedby, manageddate, accepteddate dates
-    $dbh->do(
-        "UPDATE suggestions SET suggesteddate = '1970-01-01' WHERE suggesteddate = '0000-00-00';"    
-    );
-    $dbh->do(
-        "UPDATE suggestions SET manageddate = '1970-01-01' WHERE manageddate = '0000-00-00';"    
-    );
-    $dbh->do(
-        "UPDATE suggestions SET accepteddate = '1970-01-01' WHERE accepteddate = '0000-00-00';"    
-    );
+    eval {
+        local $dbh->{PrintError} = 0;
+        $dbh->do(
+            "UPDATE suggestions SET suggesteddate = '1970-01-01' WHERE suggesteddate = '0000-00-00';"
+        );
+        $dbh->do(
+            "UPDATE suggestions SET manageddate = '1970-01-01' WHERE manageddate = '0000-00-00';"
+        );
+        $dbh->do(
+            "UPDATE suggestions SET accepteddate = '1970-01-01' WHERE accepteddate = '0000-00-00';"
+        );
+    };
 
     # Add constraint for suggestedby
     unless ( foreign_key_exists( 'suggestions', 'suggestions_ibfk_suggestedby' ) )