diff --git a/src/Plugin/ImageEffect/BackgroundImageEffect.php b/src/Plugin/ImageEffect/BackgroundImageEffect.php
index de3706c..c5c033b 100644
--- a/src/Plugin/ImageEffect/BackgroundImageEffect.php
+++ b/src/Plugin/ImageEffect/BackgroundImageEffect.php
@@ -182,6 +182,7 @@ class BackgroundImageEffect extends ConfigurableImageEffectBase implements Conta
   public function applyEffect(ImageInterface $image) {
     $background_image = $this->imageFactory->get($this->configuration['background_image']);
     if (!$background_image->isValid()) {
+      $this->logger->error('Image background failed using the %toolkit toolkit on %path', ['%toolkit' => $image->getToolkitId(), '%path' => $this->configuration['background_image']]);
       return FALSE;
     }
     list($x, $y) = explode('-', $this->configuration['placement']);
diff --git a/src/Plugin/ImageEffect/WatermarkImageEffect.php b/src/Plugin/ImageEffect/WatermarkImageEffect.php
index b8f7916..698a8d8 100644
--- a/src/Plugin/ImageEffect/WatermarkImageEffect.php
+++ b/src/Plugin/ImageEffect/WatermarkImageEffect.php
@@ -188,6 +188,7 @@ class WatermarkImageEffect extends ConfigurableImageEffectBase implements Contai
   public function applyEffect(ImageInterface $image) {
     $watermark_image = $this->imageFactory->get($this->configuration['watermark_image']);
     if (!$watermark_image->isValid()) {
+      $this->logger->error('Image watermark failed using the %toolkit toolkit on %path', ['%toolkit' => $image->getToolkitId(), '%path' => $this->configuration['watermark_image']]);
       return FALSE;
     }
     if ($this->configuration['watermark_scale'] !== NULL && $this->configuration['watermark_scale'] > 0) {
diff --git a/src/Plugin/image_effects/ImageSelector/Dropdown.php b/src/Plugin/image_effects/ImageSelector/Dropdown.php
index 74c4a1b..854c0e1 100644
--- a/src/Plugin/image_effects/ImageSelector/Dropdown.php
+++ b/src/Plugin/image_effects/ImageSelector/Dropdown.php
@@ -2,9 +2,14 @@
 
 namespace Drupal\image_effects\Plugin\image_effects\ImageSelector;
 
+use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Image\ImageFactory;
+use Drupal\Core\Routing\UrlGeneratorInterface;
 use Drupal\Core\Url;
 use Drupal\image_effects\Plugin\ImageEffectsPluginBase;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Dropdown image selector plugin.
@@ -22,6 +27,51 @@ use Drupal\image_effects\Plugin\ImageEffectsPluginBase;
 class Dropdown extends ImageEffectsPluginBase {
 
   /**
+   * The image factory service.
+   *
+   * @var \Drupal\Core\Image\ImageFactory
+   */
+  protected $imageFactory;
+
+  /**
+   * Constructs a ImageEffectsPluginBase object.
+   *
+   * @param array $configuration
+   *   A configuration array containing information about the plugin instance.
+   * @param string $plugin_id
+   *   The plugin_id for the plugin instance.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
+   *   The configuration factory.
+   * @param \Drupal\Core\Routing\UrlGeneratorInterface $url_generator
+   *   The URL generator.
+   * @param \Psr\Log\LoggerInterface $logger
+   *   The image_effects logger.
+   * @param \Drupal\Core\Image\ImageFactory $image_factory
+   *   The image factory service.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, ConfigFactoryInterface $config_factory, UrlGeneratorInterface $url_generator, LoggerInterface $logger, ImageFactory $image_factory) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition, $config_factory, $url_generator, $logger);
+    $this->imageFactory = $image_factory;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $container->get('config.factory'),
+      $container->get('url_generator'),
+      $container->get('logger.channel.image_effects'),
+      $container->get('image.factory')
+    );
+  }
+
+  /**
    * {@inheritdoc}
    */
   public function defaultConfiguration() {
@@ -105,7 +155,8 @@ class Dropdown extends ImageEffectsPluginBase {
     $filelist = array();
     if (is_dir($this->configuration['path']) && $handle = opendir($this->configuration['path'])) {
       while ($file = readdir($handle)) {
-        if (preg_match("/\.gif|\.png|\.jpg|\.jpeg$/i", $file) == 1) { // @todo make this list dependent on toolkit capabilities
+        $extension = pathinfo($file, PATHINFO_EXTENSION);
+        if (in_array($extension, $this->imageFactory->getSupportedExtensions())) {
           $filelist[] = $file;
         }
       }