diff --git a/core/lib/Drupal/Core/ImageToolkit/Annotation/ImageToolkitOperation.php b/core/lib/Drupal/Core/ImageToolkit/Annotation/ImageToolkitOperation.php
index c41b5a9..59e9fb0 100644
--- a/core/lib/Drupal/Core/ImageToolkit/Annotation/ImageToolkitOperation.php
+++ b/core/lib/Drupal/Core/ImageToolkit/Annotation/ImageToolkitOperation.php
@@ -24,8 +24,8 @@ class ImageToolkitOperation extends Plugin {
    * There are no strict requirements as to the string to be used to identify
    * the plugin, since discovery of the appropriate operation plugin to be
    * used to apply an operation is based on the values of the 'toolkit' and
-   * of the 'operation' definition keys. The 'toolkit' definition key is
-   * derived from the class namespace, while the 'operation' key is annotated.
+   * the 'operation' annotation values.
+   *
    * However, it is recommended that the following patterns be used:
    * - '{toolkit}_{operation}' for the first implementation of an operation
    *   by a toolkit.
diff --git a/core/lib/Drupal/Core/ImageToolkit/ImageToolkitBase.php b/core/lib/Drupal/Core/ImageToolkit/ImageToolkitBase.php
index 4ce0e17..fbeb4a0 100644
--- a/core/lib/Drupal/Core/ImageToolkit/ImageToolkitBase.php
+++ b/core/lib/Drupal/Core/ImageToolkit/ImageToolkitBase.php
@@ -90,7 +90,7 @@ public function apply($operation, array $arguments = array()) {
       return $this->getToolkitOperation($operation)->apply($arguments);
     }
     catch (PluginNotFoundException $e) {
-      \Drupal::logger('image')->error('The selected image handling toolkit %toolkit can not process operation %operation.', array('%toolkit' => $this->getPluginId(), '%operation' => $operation));
+      \Drupal::logger('image')->error("The selected image handling toolkit '@toolkit' can not process operation '@operation'.", array('@toolkit' => $this->getPluginId(), '@operation' => $operation));
       return FALSE;
     }
     catch (\InvalidArgumentException $e) {
diff --git a/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationBase.php b/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationBase.php
index c2e6218..1b127a3 100644
--- a/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationBase.php
+++ b/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationBase.php
@@ -95,7 +95,7 @@ protected function prepareArguments(array $arguments) {
       if ($argument['required']) {
         if (!array_key_exists($id, $arguments)) {
           // If the argument is required throw an exception.
-          throw new \InvalidArgumentException(String::format("Argument '!argument' expected by plugin '!plugin' but not passed.", array('!argument' => $id, '!plugin' => $this->getPluginId())));
+          throw new \InvalidArgumentException(String::format("Argument '@argument' expected by plugin '@plugin' but not passed.", array('@argument' => $id, '@plugin' => $this->getPluginId())));
         }
       }
       else {
@@ -105,7 +105,7 @@ protected function prepareArguments(array $arguments) {
         if (!array_key_exists('default', $argument)) {
           // The plugin did not define a default, so throw a plugin exception,
           // not an invalid argument exception.
-          throw new InvalidPluginDefinitionException(String::format("Default for argument '!argument' expected by plugin '!plugin' but not defined.", array('!argument' => $id, '!plugin' => $this->getPluginId())));
+          throw new InvalidPluginDefinitionException(String::format("Default for argument '@argument' expected by plugin '@plugin' but not defined.", array('@argument' => $id, '@plugin' => $this->getPluginId())));
         }
 
         // Use the default value if the argument is not passed in.
diff --git a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Crop.php b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Crop.php
index 3219597..6564242 100644
--- a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Crop.php
+++ b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Crop.php
@@ -6,6 +6,7 @@
  */
 
 namespace Drupal\system\Plugin\ImageToolkit\Operation\gd;
+use Drupal\Component\Utility\String;
 
 /**
  * Defines GD2 Crop operation.
@@ -65,10 +66,10 @@ protected function validateArguments(array $arguments) {
 
     // Fail when width or height are 0 or negative.
     if ($arguments['width'] <= 0) {
-      throw new \InvalidArgumentException("Invalid width specified for the image 'crop' operation.");
+      throw new \InvalidArgumentException(String::format("Invalid width (@value) specified for the image 'crop' operation.", array('@value' => $arguments['width'])));
     }
     if ($arguments['height'] <= 0) {
-      throw new \InvalidArgumentException("Invalid height specified for the image 'crop' operation.");
+      throw new \InvalidArgumentException(String::format("Invalid height (@value) specified for the image 'crop' operation.", array('@value' => $arguments['height'])));
     }
 
     return $arguments;
diff --git a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Desaturate.php b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Desaturate.php
index 7eb83a2..b6ea3e9 100644
--- a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Desaturate.php
+++ b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Desaturate.php
@@ -34,7 +34,7 @@ protected function arguments() {
   protected function execute(array $arguments) {
     // PHP installations using non-bundled GD do not have imagefilter.
     if (!function_exists('imagefilter')) {
-      \Drupal::logger('image')->notice('The image %file could not be desaturated because the imagefilter() function is not available in this PHP installation.', array('%file' => $this->getToolkit()->getImage()->getSource()));
+      \Drupal::logger('image')->notice("The image '@file' could not be desaturated because the imagefilter() function is not available in this PHP installation.", array('@file' => $this->getToolkit()->getImage()->getSource()));
       return FALSE;
     }
 
diff --git a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Resize.php b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Resize.php
index 8ce057e..aea6617 100644
--- a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Resize.php
+++ b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Resize.php
@@ -6,6 +6,7 @@
  */
 
 namespace Drupal\system\Plugin\ImageToolkit\Operation\gd;
+use Drupal\Component\Utility\String;
 
 /**
  * Defines GD2 resize operation.
@@ -44,10 +45,10 @@ protected function validateArguments(array $arguments) {
 
     // Fail when width or height are 0 or negative.
     if ($arguments['width'] <= 0) {
-      throw new \InvalidArgumentException("Invalid width specified for the image 'resize' operation.");
+      throw new \InvalidArgumentException(String::format("Invalid width (@value) specified for the image 'resize' operation.", array('@value' => $arguments['width'])));
     }
     if ($arguments['height'] <= 0) {
-      throw new \InvalidArgumentException("Invalid height specified for the image 'resize' operation.");
+      throw new \InvalidArgumentException(String::format("Invalid height (@value) specified for the image 'resize' operation.", array('@value' => $arguments['height'])));
     }
 
     return $arguments;
diff --git a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Scale.php b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Scale.php
index 637f934..c7af040 100644
--- a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Scale.php
+++ b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Scale.php
@@ -6,6 +6,7 @@
  */
 
 namespace Drupal\system\Plugin\ImageToolkit\Operation\gd;
+use Drupal\Component\Utility\String;
 
 /**
  * Defines GD2 Scale operation.
@@ -71,10 +72,10 @@ protected function validateArguments(array $arguments) {
 
     // Fail when width or height are 0 or negative.
     if ($arguments['width'] <= 0) {
-      throw new \InvalidArgumentException("Invalid width specified for the image 'scale' operation.");
+      throw new \InvalidArgumentException(String::format("Invalid width (@value) specified for the image 'scale' operation.", array('@value' => $arguments['width'])));
     }
     if ($arguments['height'] <= 0) {
-      throw new \InvalidArgumentException("Invalid height specified for the image 'scale' operation.");
+      throw new \InvalidArgumentException(String::format("Invalid height (@value) specified for the image 'scale' operation.", array('@value' => $arguments['height'])));
     }
 
     return $arguments;
diff --git a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/ScaleAndCrop.php b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/ScaleAndCrop.php
index f9124a0..203d2b6 100644
--- a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/ScaleAndCrop.php
+++ b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/ScaleAndCrop.php
@@ -6,6 +6,7 @@
  */
 
 namespace Drupal\system\Plugin\ImageToolkit\Operation\gd;
+use Drupal\Component\Utility\String;
 
 /**
  * Defines GD2 Scale and crop operation.
@@ -50,6 +51,14 @@ protected function validateArguments(array $arguments) {
       'height' => (int) round($actualHeight * $scaleFactor),
     );
 
+    // Fail when width or height are 0 or negative.
+    if ($arguments['width'] <= 0) {
+      throw new \InvalidArgumentException(String::format("Invalid width (@value) specified for the image 'scale_and_crop' operation.", array('@value' => $arguments['width'])));
+    }
+    if ($arguments['height'] <= 0) {
+      throw new \InvalidArgumentException(String::format("Invalid height (@value) specified for the image 'scale_and_crop' operation.", array('@value' => $arguments['height'])));
+    }
+
     return $arguments;
   }
 
