diff --git a/core/modules/entityreference/entityreference.module b/core/modules/entityreference/entityreference.module
index f36d052..dc58994 100644
--- a/core/modules/entityreference/entityreference.module
+++ b/core/modules/entityreference/entityreference.module
@@ -74,11 +74,12 @@ function entityreference_get_selection_handler($field, $instance = NULL, EntityI
   $plugin = drupal_container()->get('plugin.manager.entityreference.selection')->getDefinition($field['settings']['handler']);
   $class = $plugin['class'];
 
-  if (class_exists($class)) {
-    return call_user_func(array($class, 'getInstance'), $field, $instance, $entity);
+  try {
+    return $class::getInstance($field, $instance, $entity);
+  }
+  catch (Exception $e) {
+    return SelectionBroken::getInstance($field, $instance, $entity);
   }
-
-  return SelectionBroken::getInstance($field, $instance, $entity);
 }
 
 /**
@@ -160,7 +161,7 @@ function _entityreference_field_settings_process($form, $form_state) {
     '#limit_validation_errors' => array(),
   );
 
-  $handlers = entityreference_get_plugin_manager('selection')->getDefinitions();
+  $handlers = drupal_container()->get('plugin.manager.entityreference.selection')->getDefinitions();
   $handlers_options = array();
   foreach ($handlers as $handler => $handler_info) {
     $handlers_options[$handler] = check_plain($handler_info['label']);
diff --git a/core/modules/entityreference/lib/Drupal/entityreference/Tests/entityReferenceAdminTest.php b/core/modules/entityreference/lib/Drupal/entityreference/Tests/EntityReferenceAdminTest.php
similarity index 100%
rename from core/modules/entityreference/lib/Drupal/entityreference/Tests/entityReferenceAdminTest.php
rename to core/modules/entityreference/lib/Drupal/entityreference/Tests/EntityReferenceAdminTest.php
diff --git a/core/modules/entityreference/lib/Drupal/entityreference/Tests/entityReferenceSelectionAccessTest.php b/core/modules/entityreference/lib/Drupal/entityreference/Tests/EntityReferenceSelectionAccessTest.php
similarity index 100%
rename from core/modules/entityreference/lib/Drupal/entityreference/Tests/entityReferenceSelectionAccessTest.php
rename to core/modules/entityreference/lib/Drupal/entityreference/Tests/EntityReferenceSelectionAccessTest.php