diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index c7c880538..e6e7b6b89 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -380,7 +380,7 @@ add_action( 'media_buttons', 'media_buttons' );
 function media_upload_form_handler() {
 	check_admin_referer('media-form');
 
-	$errors = array();
+	$errors = null;
 
 	if ( isset($_POST['send']) ) {
 		$keys = array_keys($_POST['send']);
diff --git a/wp-admin/media-upload.php b/wp-admin/media-upload.php
index ccb364e00..3766db8a6 100644
--- a/wp-admin/media-upload.php
+++ b/wp-admin/media-upload.php
@@ -29,16 +29,7 @@ if ( isset($action) && $action == 'edit' && !$ID )
 	wp_die(__("You are not allowed to be here"));
 
 if ( isset($_GET['inline']) ) {
-
-	if ( isset($_GET['upload-page-form']) ) {
-		$errors = media_upload_form_handler();
-
-		$location = 'upload.php';
-		if ( $errors )
-			$location .= '?message=3';
-
-		wp_redirect( admin_url($location) );
-	}
+	$errors = array();
 
 	if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
 		// Upload File button was clicked
@@ -50,6 +41,16 @@ if ( isset($_GET['inline']) ) {
 		}
 	}
 
+	if ( isset($_GET['upload-page-form']) ) {
+		$errors = array_merge($errors, (array) media_upload_form_handler());
+
+		$location = 'upload.php';
+		if ( $errors )
+			$location .= '?message=3';
+
+		wp_redirect( admin_url($location) );
+	}
+
 	$title = __('Upload New Media');
 	$parent_file = 'upload.php';
 	require_once('admin-header.php'); ?>