diff --git a/src/native/common/org_lwjgl_openal_ALC.cpp b/src/native/common/org_lwjgl_openal_ALC.cpp
index fc35d2e8..d9b41625 100644
--- a/src/native/common/org_lwjgl_openal_ALC.cpp
+++ b/src/native/common/org_lwjgl_openal_ALC.cpp
@@ -199,10 +199,11 @@ JNIEXPORT jobject JNICALL Java_org_lwjgl_openal_ALC_alcCreateContext (JNIEnv *en
  * ALCboolean alcMakeContextCurrent(ALCcontext *context);
  */
 JNIEXPORT jboolean JNICALL Java_org_lwjgl_openal_ALC_alcMakeContextCurrent (JNIEnv *env, jclass clazz, jint contextaddress) {
-	if(contextaddress == NULL) {
+	ALCcontext* context = (ALCcontext*) contextaddress;
+	if(context == NULL) {
 		return alcMakeContextCurrent(NULL);
 	}
-	return alcMakeContextCurrent((ALCcontext*) contextaddress);
+	return alcMakeContextCurrent(context);
 }
 
 /**
diff --git a/src/native/common/org_lwjgl_openal_eax_CoreEAX.cpp b/src/native/common/org_lwjgl_openal_eax_CoreEAX.cpp
index 53c731c6..b7da9cde 100644
--- a/src/native/common/org_lwjgl_openal_eax_CoreEAX.cpp
+++ b/src/native/common/org_lwjgl_openal_eax_CoreEAX.cpp
@@ -110,6 +110,7 @@ JNIEXPORT jint JNICALL Java_org_lwjgl_openal_eax_CoreEAX_eaxGet (JNIEnv *env, jc
 	return result;
 #else
 	ThrowException(env, "EAX extensions not supported");
+	return 0;
 #endif
 }
 
@@ -128,6 +129,7 @@ JNIEXPORT jint JNICALL Java_org_lwjgl_openal_eax_CoreEAX_eaxSet (JNIEnv *env, jc
 	return result;
 #else
 	ThrowException(env, "EAX extensions not supported");
+	return 0;
 #endif
 }