diff --git a/build/Three.js b/build/Three.js
index 00c29cc2..7c8632a0 100755
--- a/build/Three.js
+++ b/build/Three.js
@@ -162,7 +162,7 @@ THREE.DirectionalLight&&y++;v instanceof THREE.PointLight&&t++}if(t+y<=4){u=y;t=
 c.attachShader(s,i("fragment",v+t));c.attachShader(s,i("vertex",y+u));c.linkProgram(s);c.getProgramParameter(s,c.LINK_STATUS)||alert("Could not initialise shaders\nVALIDATE_STATUS: "+c.getProgramParameter(s,c.VALIDATE_STATUS)+", gl error ["+c.getError()+"]");s.uniforms={};s.attributes={};l.program=s;t=["viewMatrix","modelViewMatrix","projectionMatrix","normalMatrix","objectMatrix","cameraPosition"];for(h in l.uniforms)t.push(h);h=l.program;u=0;for(s=t.length;u<s;u++){v=t[u];h.uniforms[v]=c.getUniformLocation(h,
 v)}h=l.program;t=["position","normal","uv","tangent"];u=0;for(s=t.length;u<s;u++){v=t[u];h.attributes[v]=c.getAttribLocation(h,v)}}h=l.program;if(h!=k){c.useProgram(h);k=h}this.loadCamera(h,d);this.loadMatrices(h);if(l instanceof THREE.MeshPhongMaterial||l instanceof THREE.MeshLambertMaterial){d=this.setupLights(h,g);l.uniforms.enableLighting.value=d.directional.positions.length+d.point.positions.length;l.uniforms.ambientLightColor.value=d.ambient;l.uniforms.directionalLightColor.value=d.directional.colors;
 l.uniforms.directionalLightDirection.value=d.directional.positions;l.uniforms.pointLightColor.value=d.point.colors;l.uniforms.pointLightPosition.value=d.point.positions}if(l instanceof THREE.MeshBasicMaterial||l instanceof THREE.MeshLambertMaterial||l instanceof THREE.MeshPhongMaterial)f(l,o);l instanceof THREE.LineBasicMaterial&&e(l,o);if(l instanceof THREE.MeshPhongMaterial){l.uniforms.ambient.value.setRGB(l.ambient.r,l.ambient.g,l.ambient.b);l.uniforms.specular.value.setRGB(l.specular.r,l.specular.g,
-l.specular.b);l.uniforms.shininess.value=l.shininess}o=l.uniforms;for(r in o){g=o[r].type;d=o[r].value;t=h.uniforms[r];if(g=="i")c.uniform1i(t,d);else if(g=="f")c.uniform1f(t,d);else if(g=="fv")c.uniform3fv(t,d);else if(g=="v2")c.uniform2f(t,d.x,d.y);else if(g=="v3")c.uniform3f(t,d.x,d.y,d.z);else if(g=="c")c.uniform3f(t,d.r,d.g,d.b);else if(g=="t"){c.uniform1i(t,d);if(g=o[r].texture)if(g.image instanceof Array&&g.image.length==6){g=g;d=d;if(g.image.length==6){if(!g.image.__webGLTextureCube&&!g.image.__cubeMapInitialized&&
+l.specular.b);l.uniforms.shininess.value=l.shininess}o=l.uniforms;for(r in o)if(t=h.uniforms[r]){g=o[r].type;d=o[r].value;if(g=="i")c.uniform1i(t,d);else if(g=="f")c.uniform1f(t,d);else if(g=="fv")c.uniform3fv(t,d);else if(g=="v2")c.uniform2f(t,d.x,d.y);else if(g=="v3")c.uniform3f(t,d.x,d.y,d.z);else if(g=="c")c.uniform3f(t,d.r,d.g,d.b);else if(g=="t"){c.uniform1i(t,d);if(g=o[r].texture)if(g.image instanceof Array&&g.image.length==6){g=g;d=d;if(g.image.length==6){if(!g.image.__webGLTextureCube&&!g.image.__cubeMapInitialized&&
 g.image.loadCount==6){g.image.__webGLTextureCube=c.createTexture();c.bindTexture(c.TEXTURE_CUBE_MAP,g.image.__webGLTextureCube);c.texParameteri(c.TEXTURE_CUBE_MAP,c.TEXTURE_WRAP_S,c.CLAMP_TO_EDGE);c.texParameteri(c.TEXTURE_CUBE_MAP,c.TEXTURE_WRAP_T,c.CLAMP_TO_EDGE);c.texParameteri(c.TEXTURE_CUBE_MAP,c.TEXTURE_MAG_FILTER,c.LINEAR);c.texParameteri(c.TEXTURE_CUBE_MAP,c.TEXTURE_MIN_FILTER,c.LINEAR_MIPMAP_LINEAR);for(t=0;t<6;++t)c.texImage2D(c.TEXTURE_CUBE_MAP_POSITIVE_X+t,0,c.RGBA,c.RGBA,c.UNSIGNED_BYTE,
 g.image[t]);c.generateMipmap(c.TEXTURE_CUBE_MAP);c.bindTexture(c.TEXTURE_CUBE_MAP,null);g.image.__cubeMapInitialized=true}c.activeTexture(c.TEXTURE0+d);c.bindTexture(c.TEXTURE_CUBE_MAP,g.image.__webGLTextureCube)}}else{g=g;d=d;if(!g.__webGLTexture&&g.image.loaded){g.__webGLTexture=c.createTexture();c.bindTexture(c.TEXTURE_2D,g.__webGLTexture);c.texImage2D(c.TEXTURE_2D,0,c.RGBA,c.RGBA,c.UNSIGNED_BYTE,g.image);c.texParameteri(c.TEXTURE_2D,c.TEXTURE_WRAP_S,j(g.wrap_s));c.texParameteri(c.TEXTURE_2D,c.TEXTURE_WRAP_T,
 j(g.wrap_t));c.texParameteri(c.TEXTURE_2D,c.TEXTURE_MAG_FILTER,j(g.mag_filter));c.texParameteri(c.TEXTURE_2D,c.TEXTURE_MIN_FILTER,j(g.min_filter));c.generateMipmap(c.TEXTURE_2D);c.bindTexture(c.TEXTURE_2D,null)}c.activeTexture(c.TEXTURE0+d);c.bindTexture(c.TEXTURE_2D,g.__webGLTexture)}}}r=h.attributes;c.bindBuffer(c.ARRAY_BUFFER,m.__webGLVertexBuffer);c.vertexAttribPointer(r.position,3,c.FLOAT,false,0,0);c.enableVertexAttribArray(r.position);if(r.normal>=0){c.bindBuffer(c.ARRAY_BUFFER,m.__webGLNormalBuffer);
diff --git a/build/ThreeDebug.js b/build/ThreeDebug.js
index efe2e3a6..26f31023 100644
--- a/build/ThreeDebug.js
+++ b/build/ThreeDebug.js
@@ -163,7 +163,7 @@ THREE.DirectionalLight&&y++;w instanceof THREE.PointLight&&t++}if(t+y<=4){u=y;t=
 c.attachShader(s,i("fragment",w+t));c.attachShader(s,i("vertex",y+u));c.linkProgram(s);c.getProgramParameter(s,c.LINK_STATUS)||alert("Could not initialise shaders\nVALIDATE_STATUS: "+c.getProgramParameter(s,c.VALIDATE_STATUS)+", gl error ["+c.getError()+"]");s.uniforms={};s.attributes={};l.program=s;t=["viewMatrix","modelViewMatrix","projectionMatrix","normalMatrix","objectMatrix","cameraPosition"];for(h in l.uniforms)t.push(h);h=l.program;u=0;for(s=t.length;u<s;u++){w=t[u];h.uniforms[w]=c.getUniformLocation(h,
 w)}h=l.program;t=["position","normal","uv","tangent"];u=0;for(s=t.length;u<s;u++){w=t[u];h.attributes[w]=c.getAttribLocation(h,w)}}h=l.program;if(h!=k){c.useProgram(h);k=h}this.loadCamera(h,d);this.loadMatrices(h);if(l instanceof THREE.MeshPhongMaterial||l instanceof THREE.MeshLambertMaterial){d=this.setupLights(h,g);l.uniforms.enableLighting.value=d.directional.positions.length+d.point.positions.length;l.uniforms.ambientLightColor.value=d.ambient;l.uniforms.directionalLightColor.value=d.directional.colors;
 l.uniforms.directionalLightDirection.value=d.directional.positions;l.uniforms.pointLightColor.value=d.point.colors;l.uniforms.pointLightPosition.value=d.point.positions}if(l instanceof THREE.MeshBasicMaterial||l instanceof THREE.MeshLambertMaterial||l instanceof THREE.MeshPhongMaterial)f(l,o);l instanceof THREE.LineBasicMaterial&&e(l,o);if(l instanceof THREE.MeshPhongMaterial){l.uniforms.ambient.value.setRGB(l.ambient.r,l.ambient.g,l.ambient.b);l.uniforms.specular.value.setRGB(l.specular.r,l.specular.g,
-l.specular.b);l.uniforms.shininess.value=l.shininess}o=l.uniforms;for(r in o){g=o[r].type;d=o[r].value;t=h.uniforms[r];if(g=="i")c.uniform1i(t,d);else if(g=="f")c.uniform1f(t,d);else if(g=="fv")c.uniform3fv(t,d);else if(g=="v2")c.uniform2f(t,d.x,d.y);else if(g=="v3")c.uniform3f(t,d.x,d.y,d.z);else if(g=="c")c.uniform3f(t,d.r,d.g,d.b);else if(g=="t"){c.uniform1i(t,d);if(g=o[r].texture)if(g.image instanceof Array&&g.image.length==6){g=g;d=d;if(g.image.length==6){if(!g.image.__webGLTextureCube&&!g.image.__cubeMapInitialized&&
+l.specular.b);l.uniforms.shininess.value=l.shininess}o=l.uniforms;for(r in o)if(t=h.uniforms[r]){g=o[r].type;d=o[r].value;if(g=="i")c.uniform1i(t,d);else if(g=="f")c.uniform1f(t,d);else if(g=="fv")c.uniform3fv(t,d);else if(g=="v2")c.uniform2f(t,d.x,d.y);else if(g=="v3")c.uniform3f(t,d.x,d.y,d.z);else if(g=="c")c.uniform3f(t,d.r,d.g,d.b);else if(g=="t"){c.uniform1i(t,d);if(g=o[r].texture)if(g.image instanceof Array&&g.image.length==6){g=g;d=d;if(g.image.length==6){if(!g.image.__webGLTextureCube&&!g.image.__cubeMapInitialized&&
 g.image.loadCount==6){g.image.__webGLTextureCube=c.createTexture();c.bindTexture(c.TEXTURE_CUBE_MAP,g.image.__webGLTextureCube);c.texParameteri(c.TEXTURE_CUBE_MAP,c.TEXTURE_WRAP_S,c.CLAMP_TO_EDGE);c.texParameteri(c.TEXTURE_CUBE_MAP,c.TEXTURE_WRAP_T,c.CLAMP_TO_EDGE);c.texParameteri(c.TEXTURE_CUBE_MAP,c.TEXTURE_MAG_FILTER,c.LINEAR);c.texParameteri(c.TEXTURE_CUBE_MAP,c.TEXTURE_MIN_FILTER,c.LINEAR_MIPMAP_LINEAR);for(t=0;t<6;++t)c.texImage2D(c.TEXTURE_CUBE_MAP_POSITIVE_X+t,0,c.RGBA,c.RGBA,c.UNSIGNED_BYTE,
 g.image[t]);c.generateMipmap(c.TEXTURE_CUBE_MAP);c.bindTexture(c.TEXTURE_CUBE_MAP,null);g.image.__cubeMapInitialized=true}c.activeTexture(c.TEXTURE0+d);c.bindTexture(c.TEXTURE_CUBE_MAP,g.image.__webGLTextureCube)}}else{g=g;d=d;if(!g.__webGLTexture&&g.image.loaded){g.__webGLTexture=c.createTexture();c.bindTexture(c.TEXTURE_2D,g.__webGLTexture);c.texImage2D(c.TEXTURE_2D,0,c.RGBA,c.RGBA,c.UNSIGNED_BYTE,g.image);c.texParameteri(c.TEXTURE_2D,c.TEXTURE_WRAP_S,j(g.wrap_s));c.texParameteri(c.TEXTURE_2D,c.TEXTURE_WRAP_T,
 j(g.wrap_t));c.texParameteri(c.TEXTURE_2D,c.TEXTURE_MAG_FILTER,j(g.mag_filter));c.texParameteri(c.TEXTURE_2D,c.TEXTURE_MIN_FILTER,j(g.min_filter));c.generateMipmap(c.TEXTURE_2D);c.bindTexture(c.TEXTURE_2D,null)}c.activeTexture(c.TEXTURE0+d);c.bindTexture(c.TEXTURE_2D,g.__webGLTexture)}}}r=h.attributes;c.bindBuffer(c.ARRAY_BUFFER,n.__webGLVertexBuffer);c.vertexAttribPointer(r.position,3,c.FLOAT,false,0,0);c.enableVertexAttribArray(r.position);if(r.normal>=0){c.bindBuffer(c.ARRAY_BUFFER,n.__webGLNormalBuffer);
diff --git a/build/ThreeExtras.js b/build/ThreeExtras.js
index 85a74f25..e03d6e48 100644
--- a/build/ThreeExtras.js
+++ b/build/ThreeExtras.js
@@ -162,7 +162,7 @@ THREE.DirectionalLight&&E++;D instanceof THREE.PointLight&&w++}if(w+E<=4){z=E;w=
 c.attachShader(x,g("fragment",D+w));c.attachShader(x,g("vertex",E+z));c.linkProgram(x);c.getProgramParameter(x,c.LINK_STATUS)||alert("Could not initialise shaders\nVALIDATE_STATUS: "+c.getProgramParameter(x,c.VALIDATE_STATUS)+", gl error ["+c.getError()+"]");x.uniforms={};x.attributes={};n.program=x;w=["viewMatrix","modelViewMatrix","projectionMatrix","normalMatrix","objectMatrix","cameraPosition"];for(l in n.uniforms)w.push(l);l=n.program;z=0;for(x=w.length;z<x;z++){D=w[z];l.uniforms[D]=c.getUniformLocation(l,
 D)}l=n.program;w=["position","normal","uv","tangent"];z=0;for(x=w.length;z<x;z++){D=w[z];l.attributes[D]=c.getAttribLocation(l,D)}}l=n.program;if(l!=i){c.useProgram(l);i=l}this.loadCamera(l,d);this.loadMatrices(l);if(n instanceof THREE.MeshPhongMaterial||n instanceof THREE.MeshLambertMaterial){d=this.setupLights(l,k);n.uniforms.enableLighting.value=d.directional.positions.length+d.point.positions.length;n.uniforms.ambientLightColor.value=d.ambient;n.uniforms.directionalLightColor.value=d.directional.colors;
 n.uniforms.directionalLightDirection.value=d.directional.positions;n.uniforms.pointLightColor.value=d.point.colors;n.uniforms.pointLightPosition.value=d.point.positions}if(n instanceof THREE.MeshBasicMaterial||n instanceof THREE.MeshLambertMaterial||n instanceof THREE.MeshPhongMaterial)f(n,q);n instanceof THREE.LineBasicMaterial&&e(n,q);if(n instanceof THREE.MeshPhongMaterial){n.uniforms.ambient.value.setRGB(n.ambient.r,n.ambient.g,n.ambient.b);n.uniforms.specular.value.setRGB(n.specular.r,n.specular.g,
-n.specular.b);n.uniforms.shininess.value=n.shininess}q=n.uniforms;for(u in q){k=q[u].type;d=q[u].value;w=l.uniforms[u];if(k=="i")c.uniform1i(w,d);else if(k=="f")c.uniform1f(w,d);else if(k=="fv")c.uniform3fv(w,d);else if(k=="v2")c.uniform2f(w,d.x,d.y);else if(k=="v3")c.uniform3f(w,d.x,d.y,d.z);else if(k=="c")c.uniform3f(w,d.r,d.g,d.b);else if(k=="t"){c.uniform1i(w,d);if(k=q[u].texture)if(k.image instanceof Array&&k.image.length==6){k=k;d=d;if(k.image.length==6){if(!k.image.__webGLTextureCube&&!k.image.__cubeMapInitialized&&
+n.specular.b);n.uniforms.shininess.value=n.shininess}q=n.uniforms;for(u in q)if(w=l.uniforms[u]){k=q[u].type;d=q[u].value;if(k=="i")c.uniform1i(w,d);else if(k=="f")c.uniform1f(w,d);else if(k=="fv")c.uniform3fv(w,d);else if(k=="v2")c.uniform2f(w,d.x,d.y);else if(k=="v3")c.uniform3f(w,d.x,d.y,d.z);else if(k=="c")c.uniform3f(w,d.r,d.g,d.b);else if(k=="t"){c.uniform1i(w,d);if(k=q[u].texture)if(k.image instanceof Array&&k.image.length==6){k=k;d=d;if(k.image.length==6){if(!k.image.__webGLTextureCube&&!k.image.__cubeMapInitialized&&
 k.image.loadCount==6){k.image.__webGLTextureCube=c.createTexture();c.bindTexture(c.TEXTURE_CUBE_MAP,k.image.__webGLTextureCube);c.texParameteri(c.TEXTURE_CUBE_MAP,c.TEXTURE_WRAP_S,c.CLAMP_TO_EDGE);c.texParameteri(c.TEXTURE_CUBE_MAP,c.TEXTURE_WRAP_T,c.CLAMP_TO_EDGE);c.texParameteri(c.TEXTURE_CUBE_MAP,c.TEXTURE_MAG_FILTER,c.LINEAR);c.texParameteri(c.TEXTURE_CUBE_MAP,c.TEXTURE_MIN_FILTER,c.LINEAR_MIPMAP_LINEAR);for(w=0;w<6;++w)c.texImage2D(c.TEXTURE_CUBE_MAP_POSITIVE_X+w,0,c.RGBA,c.RGBA,c.UNSIGNED_BYTE,
 k.image[w]);c.generateMipmap(c.TEXTURE_CUBE_MAP);c.bindTexture(c.TEXTURE_CUBE_MAP,null);k.image.__cubeMapInitialized=true}c.activeTexture(c.TEXTURE0+d);c.bindTexture(c.TEXTURE_CUBE_MAP,k.image.__webGLTextureCube)}}else{k=k;d=d;if(!k.__webGLTexture&&k.image.loaded){k.__webGLTexture=c.createTexture();c.bindTexture(c.TEXTURE_2D,k.__webGLTexture);c.texImage2D(c.TEXTURE_2D,0,c.RGBA,c.RGBA,c.UNSIGNED_BYTE,k.image);c.texParameteri(c.TEXTURE_2D,c.TEXTURE_WRAP_S,h(k.wrap_s));c.texParameteri(c.TEXTURE_2D,c.TEXTURE_WRAP_T,
 h(k.wrap_t));c.texParameteri(c.TEXTURE_2D,c.TEXTURE_MAG_FILTER,h(k.mag_filter));c.texParameteri(c.TEXTURE_2D,c.TEXTURE_MIN_FILTER,h(k.min_filter));c.generateMipmap(c.TEXTURE_2D);c.bindTexture(c.TEXTURE_2D,null)}c.activeTexture(c.TEXTURE0+d);c.bindTexture(c.TEXTURE_2D,k.__webGLTexture)}}}u=l.attributes;c.bindBuffer(c.ARRAY_BUFFER,o.__webGLVertexBuffer);c.vertexAttribPointer(u.position,3,c.FLOAT,false,0,0);c.enableVertexAttribArray(u.position);if(u.normal>=0){c.bindBuffer(c.ARRAY_BUFFER,o.__webGLNormalBuffer);
diff --git a/src/renderers/WebGLRenderer.js b/src/renderers/WebGLRenderer.js
index ecf3e2a8..cc411f31 100644
--- a/src/renderers/WebGLRenderer.js
+++ b/src/renderers/WebGLRenderer.js
@@ -1089,10 +1089,12 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 		for( u in uniforms ) {
 
+			location = program.uniforms[u];
+			if ( !location ) continue;
+			
 			type = uniforms[u].type;
 			value = uniforms[u].value;
-			location = program.uniforms[u];
-
+			
 			if( type == "i" ) {
 
 				_gl.uniform1i( location, value );