diff --git a/tests/test_aesgcmstream.py b/tests/test_aesgcmstream.py
index 90bfdb2..f2e3e47 100644
--- a/tests/test_aesgcmstream.py
+++ b/tests/test_aesgcmstream.py
@@ -20,6 +20,8 @@
 
 # pylint: disable=redefined-outer-name
 
+from contextlib import nullcontext
+
 from wolfcrypt._ffi import lib as _lib
 
 if _lib.AESGCM_STREAM_ENABLED:
@@ -139,12 +141,15 @@ if _lib.AESGCM_STREAM_ENABLED:
                 AesGcmStream(key, iv, tag_bytes=bad)
         # Valid NIST sizes: verify the resulting tag has the requested length.
         for good in (4, 8, 12, 13, 14, 15, 16):
+            expected_error = nullcontext()
             if good < _lib.MIN_AUTH_TAG_SZ:
-                continue
-            gcm = AesGcmStream(key, iv, tag_bytes=good)
-            gcm.encrypt("hello world")
-            tag = gcm.final()
-            assert len(tag) == good
+                # Number of tag bytes not supported by the current build.
+                expected_error = pytest.raises(ValueError, match="not supported by current build configuration")
+            with expected_error:
+                gcm = AesGcmStream(key, iv, tag_bytes=good)
+                gcm.encrypt("hello world")
+                tag = gcm.final()
+                assert len(tag) == good
 
     def test_decrypt_rejects_wrong_tag_length():
         key = "fedcba9876543210"
diff --git a/wolfcrypt/ciphers.py b/wolfcrypt/ciphers.py
index 2d18844..d5f96dc 100644
--- a/wolfcrypt/ciphers.py
+++ b/wolfcrypt/ciphers.py
@@ -404,6 +404,11 @@ if _lib.AESGCM_STREAM_ENABLED:
             if tag_bytes not in (4, 8, 12, 13, 14, 15, 16):
                 raise ValueError(
                     "tag_bytes must be one of 4, 8, 12, 13, 14, 15, or 16")
+            if tag_bytes < _lib.MIN_AUTH_TAG_SZ:
+                raise ValueError(
+                    f"tag_bytes {tag_bytes} not supported by current build configuration, "
+                    f"minimum: {_lib.MIN_AUTH_TAG_SZ}"
+                )
             # Per-instance state: AAD, tag length, and current mode (enc/dec).
             self._aad = b""
             self._tag_bytes = tag_bytes