diff --git a/build.xml b/build.xml
index e09d3f82..aa350828 100644
--- a/build.xml
+++ b/build.xml
@@ -306,7 +306,7 @@
 	<target name="all" description="Creates the Java archives and the natives for the current platform" depends="jars, compile_native"/>
 
 	<!-- Create ONLY the jar archives -->
-	<target name="jars" description="Creates the Java archives ONLY and places them in libs/" depends="-initialize, generate-all, compile, -createjars">
+	<target name="jars" description="Creates the Java archives ONLY and places them in libs/" depends="-initialize, compile, -createjars">
 		<move todir="libs/">
 			<fileset dir="${lwjgl.temp}/jar">
 				<include name="*.jar"/>
diff --git a/src/native/common/org_lwjgl_openal_ALC10.c b/src/native/common/org_lwjgl_openal_ALC10.c
index cd3cb184..3981132b 100644
--- a/src/native/common/org_lwjgl_openal_ALC10.c
+++ b/src/native/common/org_lwjgl_openal_ALC10.c
@@ -139,17 +139,9 @@ static jlong JNICALL Java_org_lwjgl_openal_ALC10_nalcOpenDevice (JNIEnv *env, jc
 	/* get device */
 	device = alcOpenDevice((ALubyte *) tokenstring);
 
-	/* if error - cleanup and get out */
-	if(device == NULL) {
-		if(tokenstring != NULL) {
-			free(tokenstring);
-		}
-		return (jlong) NULL;
-	}
-
-	/* clean up */
-	if (tokenstring != NULL)
+	if(tokenstring != NULL) {
 		free(tokenstring);
+	}
 
 	return (jlong)((intptr_t)device);
 }