diff --git a/library/network/http_network/src/http_stream_socket.e b/library/network/http_network/src/http_stream_socket.e
index ae900aef..3d6905c1 100644
--- a/library/network/http_network/src/http_stream_socket.e
+++ b/library/network/http_network/src/http_stream_socket.e
@@ -37,7 +37,9 @@ feature -- Input
 			-- No exception raised!
 		do
 			read_to_managed_pointer_noexception (socket_buffer, 0, character_8_bytes)
-			if bytes_read /= character_8_bytes then
+			if was_error then
+					-- Socket error already set.
+			elseif bytes_read /= character_8_bytes then
 				socket_error := "Peer closed connection"
 			else
 				last_character := socket_buffer.read_character (0)
@@ -145,6 +147,8 @@ feature {NONE} -- Input
 				l_last_read := c_read_stream_noexception (descriptor, nb_bytes - l_read, p + start_pos + l_read)
 				if l_last_read >= 0 then
 					l_read := l_read + l_last_read
+				else
+					socket_error := "Network error!"
 				end
 			end
 			bytes_read := l_read
diff --git a/library/network/http_network/src/ssl/http_stream_secure_socket.e b/library/network/http_network/src/ssl/http_stream_secure_socket.e
index 1d8686c5..bb49cd19 100644
--- a/library/network/http_network/src/ssl/http_stream_secure_socket.e
+++ b/library/network/http_network/src/ssl/http_stream_secure_socket.e
@@ -134,6 +134,8 @@ feature {NONE} -- Input
 					l_last_read := l_ssl.read (p + start_pos + l_read, nb_bytes - l_read)
 					if l_last_read >= 0 then
 						l_read := l_read + l_last_read
+					else
+						socket_error := "Secure network error!"
 					end
 				end
 				bytes_read := l_read
diff --git a/library/server/wsf/src/service/wsf_service_launcher_options.e b/library/server/wsf/src/service/wsf_service_launcher_options.e
index 265aad15..3a6d6c63 100644
--- a/library/server/wsf/src/service/wsf_service_launcher_options.e
+++ b/library/server/wsf/src/service/wsf_service_launcher_options.e
@@ -163,7 +163,7 @@ feature -- Helpers
 					Result := b
 				else
 					s := opt.out
-					Result := s.is_case_insensitive_equal ("true")
+					Result := s.is_case_insensitive_equal ("true") or s.is_case_insensitive_equal ("yes")
 				end
 			end			
 		end