diff --git a/lib/WebGUI/Attachment.pm b/lib/WebGUI/Attachment.pm
index 8ba0ce198..0eb0254be 100644
--- a/lib/WebGUI/Attachment.pm
+++ b/lib/WebGUI/Attachment.pm
@@ -514,6 +514,7 @@ If a web image (gif, png, jpg, jpeg) is being uploaded it will be resized if it
 
 sub save {
 	my ($type, $file, $filename, $bytesread, $buffer, $urlizedFilename, $path);
+	return "" if ($session{header}{status} =~ /^413/);
 	$filename = $session{cgi}->upload($_[1]);
 	if (defined $filename) {
 		if ($filename =~ /([^\/\\]+)$/) {
diff --git a/lib/WebGUI/Session.pm b/lib/WebGUI/Session.pm
index 686fbba69..0227e6726 100644
--- a/lib/WebGUI/Session.pm
+++ b/lib/WebGUI/Session.pm
@@ -439,6 +439,12 @@ sub open {
 	### CGI object
 	$CGI::POST_MAX=1024 * $session{setting}{maxAttachmentSize};
 	$session{cgi} = CGI->new();
+        if ($session{cgi}->cgi_error =~ /^413/) {
+		$session{header}{status} = $session{cgi}->cgi_error;
+		WebGUI::ErrorHandler::warn("File upload too big. May need to adjust Max File Size setting.");
+		$CGI::POST_MAX=-1;
+		$session{cgi} = CGI->new();
+        }
 	###----------------------------
 	### header variables
 	$session{header}{mimetype} = 'text/html';