diff --git a/admin/blocks.php b/admin/blocks.php
index d585b9f9779..dcbda49466c 100644
--- a/admin/blocks.php
+++ b/admin/blocks.php
@@ -123,7 +123,7 @@
 /// Get and sort the existing blocks
 
     if (false === ($blocks = get_records('block'))) {
-        print_error('No blocks found!');  // Should never happen
+        print_error('noblocks', 'error');  // Should never happen
     }
 
     $incompatible = array();
@@ -143,7 +143,7 @@
     }
 
     if(empty($blockbyname)) {
-        print_error('One or more blocks are registered in the database, but they all failed to load!');
+        print_error('failtoloadblocks', 'error');
     }
 
     ksort($blockbyname);
diff --git a/admin/cliupgrade.php b/admin/cliupgrade.php
index c5035da6b3d..b2189cecceb 100644
--- a/admin/cliupgrade.php
+++ b/admin/cliupgrade.php
@@ -1234,10 +1234,10 @@ if ( file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
                 mark_context_dirty('/'.SYSCONTEXTID);
                 // do nothing
             } else {
-                print_error("Serious Error! Could not set up a default course category!");
+                print_error('cannotsetupcategory', 'error');
             }
         } else {
-            print_error("Serious Error! Could not set up the site!");
+            print_error('cannotsetupsite', 'error');
         }
     }