diff --git a/examples/upload_image/upload_image-safe.ecf b/examples/upload_image/upload_image-safe.ecf
index b573ad56..873825f6 100644
--- a/examples/upload_image/upload_image-safe.ecf
+++ b/examples/upload_image/upload_image-safe.ecf
@@ -20,10 +20,13 @@
 	</target>
 	<target name="upload_image_standalone" extends="upload_image_common">
 		<root class="IMAGE_UPLOADER" feature="make"/>
-		<setting name="concurrency" value="thread"/>
+		<setting name="concurrency" value="scoop"/>
 		<library name="default_standalone" location="..\..\library\server\wsf\default\standalone-safe.ecf" readonly="false" use_application_options="true"/>
 		<cluster name="src" location="src\" recursive="true"/>
 	</target>
+	<target name="upload_image_standalone_st" extends="upload_image_standalone">
+		<setting name="concurrency" value="none"/>
+	</target>
 	<target name="upload_image_libfcgi" extends="upload_image_common">
 		<root class="IMAGE_UPLOADER" feature="make"/>
 		<setting name="concurrency" value="none"/>
diff --git a/library/server/ewsgi/connectors/standalone/src/wgi_standalone_input_stream.e b/library/server/ewsgi/connectors/standalone/src/wgi_standalone_input_stream.e
index 15d1264e..a8d8f4a1 100644
--- a/library/server/ewsgi/connectors/standalone/src/wgi_standalone_input_stream.e
+++ b/library/server/ewsgi/connectors/standalone/src/wgi_standalone_input_stream.e
@@ -43,7 +43,7 @@ feature -- Input
 		do
 			src := source
 			if src.readable and not src.was_error then
-				src.read_character
+				src.read_character_noexception
 				last_character := src.last_character
 			else
 				last_character := '%U'
@@ -57,7 +57,7 @@ feature -- Input
 			src := source
 			last_string.wipe_out
 			if src.readable and not src.was_error then
-				src.read_stream_thread_aware (nb)
+				src.read_stream_noexception (nb)
 				last_string.append_string (src.last_string)
 			end
 		end
diff --git a/library/server/ewsgi/connectors/standalone/src/wgi_standalone_output_stream.e b/library/server/ewsgi/connectors/standalone/src/wgi_standalone_output_stream.e
index 2652576f..b438ba9c 100644
--- a/library/server/ewsgi/connectors/standalone/src/wgi_standalone_output_stream.e
+++ b/library/server/ewsgi/connectors/standalone/src/wgi_standalone_output_stream.e
@@ -90,7 +90,7 @@ feature -- Output
 	put_character (c: CHARACTER_8)
 		do
 			last_target_call_succeed := False
-			target.put_character (c)
+			target.put_character_noexception (c)
 			last_target_call_succeed := not target.was_error
 		end