diff --git a/wp-admin/theme-editor.php b/wp-admin/theme-editor.php
index 3ea3c4ae5..84a48a9a6 100644
--- a/wp-admin/theme-editor.php
+++ b/wp-admin/theme-editor.php
@@ -158,6 +158,10 @@ foreach ( wp_get_themes( array( 'errors' => null ) ) as $a_stylesheet => $a_them
 </div>
 <br class="clear" />
 </div>
+<?php
+if ( $theme->errors() )
+	echo '<div class="error"><p><strong>' . __( 'This theme is broken.' ) . '</strong> ' . $theme->errors()->get_error_message() . '</p></div>';
+?>
 	<div id="templateside">
 <?php
 if ( $allowed_files ) :