Index: /Users/simon/Projects/WordPress-Bleeding/site/wordpress/wp-includes/taxonomy.php
===================================================================
--- /Users/simon/Projects/WordPress-Bleeding/site/wordpress/wp-includes/taxonomy.php	(revision 10792)
+++ /Users/simon/Projects/WordPress-Bleeding/site/wordpress/wp-includes/taxonomy.php	(working copy)
@@ -1561,6 +1561,8 @@
 
 	// First, get all of the original args
 	$term = get_term ($term_id, $taxonomy, ARRAY_A);
+	// Check it's not an error, and return the error immediately if it is
+	if ( is_wp_error( $term ) ) return $term;
 
 	// Escape data pulled from DB.
 	$term = add_magic_quotes($term);