diff --git a/devel.module b/devel.module
index 4364125..56065ed 100644
--- a/devel.module
+++ b/devel.module
@@ -1079,7 +1079,7 @@ function kprint_r($input, $return = FALSE, $name = NULL, $function = 'print_r')
       $output = dprint_r($input, $return, $name, $function);
     }
 
-    return SafeMarkup::set($output);
+    return SafeString::create($output);
   }
 }
 
diff --git a/src/Form/SettingsForm.php b/src/Form/SettingsForm.php
index af230ca..99e3de9 100644
--- a/src/Form/SettingsForm.php
+++ b/src/Form/SettingsForm.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\devel\Form;
 
-use Drupal\Core\Render\SafeString;
+use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Form\ConfigFormBase;
 use Symfony\Component\HttpFoundation\Request;
 use Drupal\Core\Form\FormStateInterface;
@@ -121,8 +121,8 @@ class SettingsForm extends ConfigFormBase {
       ),
       '#multiple' => TRUE,
       '#default_value' => empty($error_handlers) ? DEVEL_ERROR_HANDLER_NONE : $error_handlers,
-      // TODO properly handle this without use SafeString
-      '#description' => SafeString::create(t('Select the error handler(s) to use, in case you <a href="@choose">choose to show errors on screen</a>.', array('@choose' => $this->url('system.logging_settings'))) . '<ul>' .
+
+      '#description' => SafeMarkup::format(t('Select the error handler(s) to use, in case you <a href="@choose">choose to show errors on screen</a>.', array('@choose' => $this->url('system.logging_settings'))) . '<ul>' .
           '<li>' . t('<em>None</em> is a good option when stepping through the site in your debugger.') . '</li>' .
           '<li>' . t('<em>Standard Drupal</em> does not display all the information that is often needed to resolve an issue.') . '</li>' .
           '<li>' . t('<em>Krumo backtrace</em> displays nice debug information when any type of error is noticed, but only to users with the %perm permission.', array('%perm' => t('Access developer information'))) . '</li></ul>' .
@@ -131,7 +131,7 @@ class SettingsForm extends ConfigFormBase {
           $this->l('notice', $current_url, array('query' => array('demo' => 'notice'))) . ', ' .
           $this->l('notice+warning', $current_url, array('query' => array('demo' => 'warning'))) . ', ' .
           $this->l('notice+warning+error', $current_url, array('query' => array('demo' => 'error'))) . ' ' .
-          t('(The presentation of the @error is determined by PHP.)', array('@error' => 'error'))),
+          t('(The presentation of the @error is determined by PHP.)', array('@error' => 'error')), array()),
     );
     $form['error_handlers']['#size'] = count($form['error_handlers']['#options']);
     if ($request->query->has('demo')) {