diff --git a/core/modules/block/src/BlockListBuilder.php b/core/modules/block/src/BlockListBuilder.php
index 293f088..00d36b7 100644
--- a/core/modules/block/src/BlockListBuilder.php
+++ b/core/modules/block/src/BlockListBuilder.php
@@ -398,6 +398,7 @@ public function validateForm(array &$form, FormStateInterface $form_state) {
    * Form submission handler for the main block administration form.
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
+      
     $entities = $this->storage->loadMultiple(array_keys($form_state->getValue('blocks')));
     foreach ($entities as $entity_id => $entity) {
       $entity_values = $form_state->getValue(array('blocks', $entity_id));
@@ -410,6 +411,16 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
         $entity->enable();
       }
       $entity->save();
+      
+      // let other modules interact if a block is changed
+      $messages = array();
+      $messages = \Drupal::moduleHandler()->invokeAll('block_admin_display_form_submit', array($entity));
+      if ($messages) {
+        foreach($messages as $message) {
+          drupal_set_message($message);
+        }
+      }
+
     }
     drupal_set_message(t('The block settings have been updated.'));
 
diff --git a/core/modules/language/language.module b/core/modules/language/language.module
index d0b9aab..8097ffb 100644
--- a/core/modules/language/language.module
+++ b/core/modules/language/language.module
@@ -5,6 +5,7 @@
  * Add language handling functionality to Drupal.
  */
 
+use Drupal\block\BlockInterface;
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Entity\ContentEntityFormInterface;
 use Drupal\Core\Entity\EntityFormInterface;
@@ -508,6 +509,24 @@ function language_field_info_alter(&$info) {
 }
 
 /**
+ * Implements hook_block_admin_display_form_submit().
+ */
+function language_block_admin_display_form_submit($entity) {
+  // If the language switcher block has been enabled, check to see whether
+  // any languages have been added (if they haven't it won't work)
+  $messages = array();
+  if ($entity->id() == 'languageswitcher' && $entity->get('region') != BlockInterface::BLOCK_REGION_NONE) {
+    $language_list = Drupal::languageManager()->getLanguages();
+    if (count($language_list) <= 1) {
+      $messages['advice'] = t('With the language switcher block you can switch the languages of the interface,
+                                to do this you will need to add a language on the <a href="@language_admin">language administration page</a>',
+                                array('@language_admin' => '/admin/config/regional/language'));
+      }
+  }
+  return $messages;
+}
+
+/**
  * Implements hook_entity_field_access()
  */
 function language_entity_field_access($operation, FieldDefinitionInterface $field_definition, AccountInterface $account, FieldItemListInterface $items = NULL) {