diff --git a/pyproject.toml b/pyproject.toml
index ecf7644e..b4527aaa 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "tyro"
-version = "0.4.1"
+version = "0.4.2"
 description = "Strongly typed, zero-effort CLI interfaces"
 authors = ["brentyi <brentyi@berkeley.edu>"]
 include = ["./tyro/**/*"]
@@ -66,6 +66,7 @@ exclude_lines = [
 
     # or assert statements & errors
     "assert",
+    "raise AssertionError",
 
     # or anything that's not implemented
     "NotImplementedError()",
diff --git a/tyro/_strings.py b/tyro/_strings.py
index 7ca994e7..620106e3 100644
--- a/tyro/_strings.py
+++ b/tyro/_strings.py
@@ -81,12 +81,13 @@ def _subparser_name_from_type(cls: Type) -> Tuple[str, bool]:
 
     # Subparser name from class name.
     def get_name(cls: Type) -> str:
-        if hasattr(cls, "__name__"):
-            return hyphen_separated_from_camel_case(cls.__name__)
-        elif hasattr(get_origin(cls), "__name__"):
-            parts = [get_origin(cls).__name__]  # type: ignore
+        orig = get_origin(cls)
+        if orig is not None and hasattr(orig, "__name__"):
+            parts = [orig.__name__]  # type: ignore
             parts.extend(map(get_name, get_args(cls)))
             return "-".join(parts)
+        elif hasattr(cls, "__name__"):
+            return hyphen_separated_from_camel_case(cls.__name__)
         else:
             raise AssertionError(
                 f"Tried to interpret {cls} as a subcommand, but could not infer name"