diff --git a/zerver/tests/test_subs.py b/zerver/tests/test_subs.py
index df93737a6b..49ee6a080e 100644
--- a/zerver/tests/test_subs.py
+++ b/zerver/tests/test_subs.py
@@ -122,7 +122,7 @@ class StreamAdminTest(ZulipTestCase):
         }
         stream_id = get_stream('private_stream', user_profile.realm).id
         result = self.client_patch("/json/streams/%d" % (stream_id,), params)
-        self.assert_json_error(result, 'You are not invited to this stream.')
+        self.assert_json_error(result, 'Invalid stream id')
 
         self.subscribe_to_stream(email, 'private_stream')
 
diff --git a/zerver/views/streams.py b/zerver/views/streams.py
index 1462fd214b..de0945392b 100644
--- a/zerver/views/streams.py
+++ b/zerver/views/streams.py
@@ -164,7 +164,7 @@ def update_stream_backend(request, user_profile, stream_id,
                           is_private=REQ(validator=check_bool, default=None),
                           new_name=REQ(validator=check_string, default=None)):
     # type: (HttpRequest, UserProfile, int, Optional[Text], Optional[bool], Optional[Text]) -> HttpResponse
-    stream = get_and_validate_stream_by_id(stream_id, user_profile.realm)
+    (stream, recipient, sub) = access_stream_by_id(user_profile, stream_id)
 
     if description is not None:
         do_change_stream_description(user_profile.realm, stream.name, description)