diff --git a/src/Form/BricksetConnectAdminForm.php b/src/Form/BricksetConnectAdminForm.php
index fb5d89f..e9dc3ac 100644
--- a/src/Form/BricksetConnectAdminForm.php
+++ b/src/Form/BricksetConnectAdminForm.php
@@ -8,6 +8,7 @@ namespace Drupal\brickset_connect\Form;
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\brickset_connect\BricksetConnectAPIClient;
+use Drupal\Core\Messenger\MessengerInterface;
 
 class BricksetConnectAdminForm extends ConfigFormBase {
   /**
@@ -85,6 +86,9 @@ class BricksetConnectAdminForm extends ConfigFormBase {
       ->set('brickset_password', $form_state->getValue('brickset_password'))
 		  ->save();
 
-    drupal_set_message('Settings saved.');
+    \Drupal::messenger()
+      ->addMessage(
+        'Settings saved.'
+      );
   }
 }
diff --git a/src/Form/BricksetConnectContentMenuForm.php b/src/Form/BricksetConnectContentMenuForm.php
index 3e7e798..5896157 100644
--- a/src/Form/BricksetConnectContentMenuForm.php
+++ b/src/Form/BricksetConnectContentMenuForm.php
@@ -80,10 +80,10 @@ class BricksetConnectContentMenuForm extends FormBase {
    		$api_check_result = BricksetConnectAPIClient::check_api_key();
 
    		if (!$api_check_result) {
-   		  $e . "<p><strong>API key check failed.</strong></p>";
+   		  $api_check_message = $e->getMessage() . "<p><strong>API key check failed.</strong></p>";
    		}
 
-      \Drupal::logger('brickset_connect')->error('Exception: ' . $e->getMessage());
+      \Drupal::logger('brickset_connect')->error('Exception: ' . $api_check_message);
    	}
   }
 
@@ -91,6 +91,8 @@ class BricksetConnectContentMenuForm extends FormBase {
    * {@inheritdoc}
    */
   public function refresh(array &$form, FormStateInterface $form_state) {
-    drupal_set_message("Refreshing dees sumsa bitches!");
+    \Drupal::messenger()->addMessage(
+      "Refreshing dees sumsa bitches!"
+    );
   }
 }
\ No newline at end of file