diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index 68771734cd..e242fb4c7c 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -616,6 +616,7 @@ jQuery(function($){
 				"auth_cookie" : "<?php echo $_COOKIE[AUTH_COOKIE]; ?>",
 				"type" : "media"
 			},
+			file_size_limit : "<?php echo wp_max_upload_size(); ?>b",
 			swfupload_element_id : "flash-upload-ui", // id of the element displayed when swfupload is available
 			degraded_element_id : "html-upload-ui",   // when swfupload is unavailable
 			swfupload_loaded_handler : uploadLoaded,
diff --git a/wp-includes/js/swfupload/handlers.js b/wp-includes/js/swfupload/handlers.js
index 112c7e1a75..6253ef7b2a 100644
--- a/wp-includes/js/swfupload/handlers.js
+++ b/wp-includes/js/swfupload/handlers.js
@@ -140,7 +140,6 @@ function fileDialogComplete(num_files_queued) {
 }
 
 function uploadError(fileObj, error_code, message) {
-alert(message);return;
 	// first the file specific error
 	if ( error_code == SWFUpload.UPLOAD_ERROR.MISSING_UPLOAD_URL ) {
 		wpFileError(fileObj, swfuploadL10n.missing_upload_url);