diff --git a/src/context.c b/src/context.c
index 3842f0a37..3b4336994 100644
--- a/src/context.c
+++ b/src/context.c
@@ -585,12 +585,6 @@ GLFWAPI void glfwMakeContextCurrent(GLFWwindow* handle)
 
     _GLFW_REQUIRE_INIT();
 
-    if (window && window->context.client == GLFW_NO_API)
-    {
-        _glfwInputError(GLFW_NO_WINDOW_CONTEXT, NULL);
-        return;
-    }
-
     if (previous)
     {
         if (!window || window->context.source != previous->context.source)
diff --git a/src/egl_context.c b/src/egl_context.c
index 23981c8d6..6140f0f78 100644
--- a/src/egl_context.c
+++ b/src/egl_context.c
@@ -311,6 +311,8 @@ GLFWbool _glfwInitEGL(void)
         "libEGL.dylib",
 #elif defined(__CYGWIN__)
         "libEGL-1.so",
+#elif defined(_GLFW_ANDROID)
+        "libEGL.so",
 #else
         "libEGL.so.1",
 #endif
@@ -465,7 +467,6 @@ GLFWbool _glfwCreateContextEGL(_GLFWwindow* window,
     EGLConfig config;
     EGLContext share = NULL;
     int index = 0;
-
     if (!_glfw.egl.display)
     {
         _glfwInputError(GLFW_API_UNAVAILABLE, "EGL: API not available");
@@ -635,6 +636,7 @@ GLFWbool _glfwCreateContextEGL(_GLFWwindow* window,
             "libGLES_CM.so",
 #else
             "libGLESv1_CM.so.1",
+            "libGLES_CM.so.1"
 #endif
             NULL
         };