Index: wp-includes/class-wp-image-editor.php
===================================================================
--- wp-includes/class-wp-image-editor.php	(revision 22225)
+++ wp-includes/class-wp-image-editor.php	(working copy)
@@ -45,7 +45,7 @@
 			return $editor;
 		}
 
-		return false;
+		return new WP_Error( 'no_editor', __('No editor could be selected') );
 	}
 
 	/**