diff --git a/library/server/ewsgi/src/wgi_chunked_input_stream.e b/library/server/ewsgi/src/wgi_chunked_input_stream.e
index d9db7584..016e7107 100644
--- a/library/server/ewsgi/src/wgi_chunked_input_stream.e
+++ b/library/server/ewsgi/src/wgi_chunked_input_stream.e
@@ -124,17 +124,19 @@ feature {NONE} -- Parser
 
 	read_trailer
 		do
-			print (" Reading trailer ")
-			from
-				input.read_character
-			until
-				input.last_character.is_equal ('%R')
-			loop
-				print (input.last_character)
+			if not input.end_of_input then
+				print (" Reading trailer ")
+				from
+					input.read_character
+				until
+					input.last_character.is_equal ('%R')
+				loop
+					print (input.last_character)
+					input.read_character
+				end
+				-- read the LF
 				input.read_character
 			end
-			-- read the LF
-			input.read_character
 		end
 feature {NONE} -- Access