diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php
index 3e23d3f5e3..15f26d15a1 100644
--- a/wp-admin/includes/file.php
+++ b/wp-admin/includes/file.php
@@ -265,7 +265,7 @@ function wp_handle_upload( &$file, $overrides = false, $time = null ) {
 
 	// A non-empty file will pass this test.
 	if ( $test_size && !($file['size'] > 0 ) )
-		return $upload_error_handler( $file, __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini.' ));
+		return $upload_error_handler( $file, __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.' ));
 
 	// A properly uploaded file will pass this test. There should be no reason to override this one.
 	if (! @ is_uploaded_file( $file['tmp_name'] ) )
diff --git a/wp-admin/includes/import.php b/wp-admin/includes/import.php
index 820ee540e9..79f7927ec8 100644
--- a/wp-admin/includes/import.php
+++ b/wp-admin/includes/import.php
@@ -59,6 +59,11 @@ function wp_import_cleanup( $id ) {
  * @return array
  */
 function wp_import_handle_upload() {
+	if ( !isset($_FILES['import']) ) {
+		$file['error'] = __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.' );	
+		return $file;
+	}
+	
 	$overrides = array( 'test_form' => false, 'test_type' => false );
 	$_FILES['import']['name'] .= '.txt';
 	$file = wp_handle_upload( $_FILES['import'], $overrides );