diff --git a/wp-admin/admin-db.php b/wp-admin/admin-db.php
index 848e1eb630..63d4a8ceac 100644
--- a/wp-admin/admin-db.php
+++ b/wp-admin/admin-db.php
@@ -84,6 +84,9 @@ function wp_insert_category($catarr) {
 
 	extract($catarr);
 
+	if( trim( $cat_name ) == '' )
+		return 0;
+
 	$cat_ID = (int) $cat_ID;
 
 	// Are we updating or creating?
diff --git a/wp-admin/categories.php b/wp-admin/categories.php
index 65d4b7fba9..cd31c69762 100644
--- a/wp-admin/categories.php
+++ b/wp-admin/categories.php
@@ -15,9 +15,11 @@ case 'addcat':
 	if ( !current_user_can('manage_categories') )
 		wp_die(__('Cheatin’ uh?'));
 
-	wp_insert_category($_POST);
-
-	wp_redirect('categories.php?message=1#addcat');
+	if( wp_insert_category($_POST ) ) {
+		wp_redirect('categories.php?message=1#addcat');
+	} else {
+		wp_redirect('categories.php?message=4#addcat');
+	}
 break;
 
 case 'delete':
@@ -71,6 +73,7 @@ require_once ('admin-header.php');
 $messages[1] = __('Category added.');
 $messages[2] = __('Category deleted.');
 $messages[3] = __('Category updated.');
+$messages[4] = __('Category not added.');
 ?>
 
 <?php if (isset($_GET['message'])) : ?>