diff --git a/examples/metsr/test.scenic b/examples/metsr/test.scenic
index ea6658fc1..f1597eeda 100644
--- a/examples/metsr/test.scenic
+++ b/examples/metsr/test.scenic
@@ -2,6 +2,9 @@ param startTime = 0
 param map = "CARLA_TOWN5"
 model scenic.simulators.metsr.model
 
+# TODO: Test distribution as parameter default
+# TODO: Ask Zengxiang what benchmark performance is
+
 scenario CustomCommuterTrafficStream(origin, destination):
     setup:
         num_commuters = Range(100, 200)
diff --git a/src/scenic/simulators/metsr/client.py b/src/scenic/simulators/metsr/client.py
index 4ff508f65..8d783d32c 100644
--- a/src/scenic/simulators/metsr/client.py
+++ b/src/scenic/simulators/metsr/client.py
@@ -33,6 +33,8 @@ def __init__(self, host, port, max_connection_attempts=5, timeout=30, verbose=Fa
                     raise RuntimeError("Could not connect to METS-R Sim")
                 time.sleep(10)
 
+        assert self.ws
+
         # Ensure server is initialized by waiting to receive an initial packet
         # (could be ANS_ready or a heartbeat)
         self.receive_msg(ignore_heartbeats=False)