diff --git a/wp-includes/class-wp-image-editor.php b/wp-includes/class-wp-image-editor.php
index 83c6b94e0a..6ee94a28f4 100644
--- a/wp-includes/class-wp-image-editor.php
+++ b/wp-includes/class-wp-image-editor.php
@@ -45,7 +45,7 @@ abstract class WP_Image_Editor {
 			return $editor;
 		}
 
-		return false;
+		return new WP_Error( 'no_editor', __('No editor could be selected') );
 	}
 
 	/**