diff --git a/libraries/common/src/main/java/androidx/media3/common/util/GlUtil.java b/libraries/common/src/main/java/androidx/media3/common/util/GlUtil.java
index b695cf1314..f08f0549fe 100644
--- a/libraries/common/src/main/java/androidx/media3/common/util/GlUtil.java
+++ b/libraries/common/src/main/java/androidx/media3/common/util/GlUtil.java
@@ -54,9 +54,6 @@ public final class GlUtil {
     }
   }
 
-  /** Thrown when the required EGL version is not supported by the device. */
-  public static final class UnsupportedEglVersionException extends Exception {}
-
   /**
    * Represents a GLSL shader program.
    *
@@ -260,15 +257,9 @@ public final class GlUtil {
     return Api17.createEglDisplay();
   }
 
-  /**
-   * Returns a new {@link EGLContext} for the specified {@link EGLDisplay}.
-   *
-   * @throws UnsupportedEglVersionException If the device does not support EGL version 2. {@code
-   *     eglDisplay} is terminated before the exception is thrown in this case.
-   */
+  /** Returns a new {@link EGLContext} for the specified {@link EGLDisplay}. */
   @RequiresApi(17)
-  public static EGLContext createEglContext(EGLDisplay eglDisplay)
-      throws UnsupportedEglVersionException {
+  public static EGLContext createEglContext(EGLDisplay eglDisplay) {
     return Api17.createEglContext(eglDisplay);
   }
 
@@ -638,8 +629,7 @@ public final class GlUtil {
     }
 
     @DoNotInline
-    public static EGLContext createEglContext(EGLDisplay eglDisplay)
-        throws UnsupportedEglVersionException {
+    public static EGLContext createEglContext(EGLDisplay eglDisplay) {
       int[] contextAttributes = {EGL14.EGL_CONTEXT_CLIENT_VERSION, 2, EGL14.EGL_NONE};
       EGLContext eglContext =
           EGL14.eglCreateContext(
@@ -650,7 +640,9 @@ public final class GlUtil {
               /* offset= */ 0);
       if (eglContext == null) {
         EGL14.eglTerminate(eglDisplay);
-        throw new UnsupportedEglVersionException();
+        throwGlException(
+            "eglCreateContext() failed to create a valid context. The device may not support EGL"
+                + " version 2");
       }
       checkGlError();
       return eglContext;
diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/FrameEditor.java b/libraries/transformer/src/main/java/androidx/media3/transformer/FrameEditor.java
index 27fc360fac..b76e3c1b87 100644
--- a/libraries/transformer/src/main/java/androidx/media3/transformer/FrameEditor.java
+++ b/libraries/transformer/src/main/java/androidx/media3/transformer/FrameEditor.java
@@ -60,12 +60,7 @@ import java.util.concurrent.atomic.AtomicInteger;
       Surface outputSurface,
       Transformer.DebugViewProvider debugViewProvider) {
     EGLDisplay eglDisplay = GlUtil.createEglDisplay();
-    EGLContext eglContext;
-    try {
-      eglContext = GlUtil.createEglContext(eglDisplay);
-    } catch (GlUtil.UnsupportedEglVersionException e) {
-      throw new IllegalStateException("EGL version is unsupported", e);
-    }
+    EGLContext eglContext = GlUtil.createEglContext(eglDisplay);
     EGLSurface eglSurface = GlUtil.getEglSurface(eglDisplay, outputSurface);
     GlUtil.focusSurface(eglDisplay, eglContext, eglSurface, outputWidth, outputHeight);
     int textureId = GlUtil.createExternalTexture();