diff --git a/zxingorg/build.xml b/zxingorg/build.xml
index 493e4e7cf..c8def96f0 100644
--- a/zxingorg/build.xml
+++ b/zxingorg/build.xml
@@ -20,7 +20,7 @@
   <property file="secrets.properties"/>
 
   <target name="init">
-		<tstamp/>
+    <tstamp/>
     <fail message="Please build 'core' first">
       <condition>
         <not>
@@ -35,10 +35,17 @@
         </not>
       </condition>
     </fail>
+    <fail message="Please set 'tomcat-home' in build.properties">
+      <condition>
+        <not>
+          <available file="${tomcat-home}" type="dir"/>
+        </not>
+      </condition>
+    </fail>
   </target>
 
-	<target name="build" depends="init">
-		<mkdir dir="web/WEB-INF/classes"/>
+  <target name="build" depends="init">
+    <mkdir dir="web/WEB-INF/classes"/>
     <copy file="../core/core.jar" todir="web/WEB-INF/lib" overwrite="true"/>
     <copy file="../javase/javase.jar" todir="web/WEB-INF/lib" overwrite="true"/>
     <javac srcdir="src"
@@ -48,13 +55,13 @@
            optimize="true"
            debug="true"
            deprecation="true">
-			<classpath>
-				<fileset dir="web/WEB-INF/lib">
-					<include name="*.jar"/>
-				</fileset>
-				<pathelement location="${tomcat-home}/lib/servlet-api.jar"/>
-			</classpath>
-		</javac>
+      <classpath>
+        <fileset dir="web/WEB-INF/lib">
+          <include name="*.jar"/>
+        </fileset>
+        <pathelement location="${tomcat-home}/lib/servlet-api.jar"/>
+      </classpath>
+    </javac>
     <copy file="web/WEB-INF/web.xml.template" tofile="web/WEB-INF/web.xml" overwrite="true">
       <filterset>
         <filter token="EMAIL_PASSWORD" value="${emailPassword}"/>
@@ -72,7 +79,7 @@
     </war>
   </target>
 
-	<target name="clean">
+  <target name="clean">
     <delete dir="web/WEB-INF/web.xml"/>
     <delete dir="web/WEB-INF/classes"/>
     <delete file="web/WEB-INF/lib/core.jar"/>
diff --git a/zxingorg/src/com/google/zxing/web/DecodeServlet.java b/zxingorg/src/com/google/zxing/web/DecodeServlet.java
index 457045210..0135bb3af 100644
--- a/zxingorg/src/com/google/zxing/web/DecodeServlet.java
+++ b/zxingorg/src/com/google/zxing/web/DecodeServlet.java
@@ -36,9 +36,9 @@ import org.apache.http.HttpResponse;
 import org.apache.http.HttpVersion;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpGet;
-import org.apache.http.conn.PlainSocketFactory;
-import org.apache.http.conn.Scheme;
-import org.apache.http.conn.SchemeRegistry;
+import org.apache.http.conn.scheme.PlainSocketFactory;
+import org.apache.http.conn.scheme.Scheme;
+import org.apache.http.conn.scheme.SchemeRegistry;
 import org.apache.http.conn.ssl.SSLSocketFactory;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
@@ -160,9 +160,6 @@ public final class DecodeServlet extends HttpServlet {
       } finally {
         is.close();
       }
-    } catch (InterruptedException ie) {
-      getRequest.abort();
-      response.sendRedirect("badurl.jspx");
     } catch (HttpException he) {
       getRequest.abort();
       response.sendRedirect("badurl.jspx");
diff --git a/zxingorg/web/WEB-INF/lib/httpclient-4.0-alpha3.jar b/zxingorg/web/WEB-INF/lib/httpclient-4.0-alpha3.jar
deleted file mode 100644
index 2821cd54c..000000000
Binary files a/zxingorg/web/WEB-INF/lib/httpclient-4.0-alpha3.jar and /dev/null differ
diff --git a/zxingorg/web/WEB-INF/lib/httpclient-4.0-alpha4.jar b/zxingorg/web/WEB-INF/lib/httpclient-4.0-alpha4.jar
new file mode 100644
index 000000000..a54a9c3b4
Binary files /dev/null and b/zxingorg/web/WEB-INF/lib/httpclient-4.0-alpha4.jar differ
diff --git a/zxingorg/web/WEB-INF/lib/httpcore-4.0-beta1.jar b/zxingorg/web/WEB-INF/lib/httpcore-4.0-beta2.jar
similarity index 75%
rename from zxingorg/web/WEB-INF/lib/httpcore-4.0-beta1.jar
rename to zxingorg/web/WEB-INF/lib/httpcore-4.0-beta2.jar
index 48b00796e..608b2eb68 100644
Binary files a/zxingorg/web/WEB-INF/lib/httpcore-4.0-beta1.jar and b/zxingorg/web/WEB-INF/lib/httpcore-4.0-beta2.jar differ
diff --git a/zxingorg/web/WEB-INF/lib/httpcore-nio-4.0-beta1.jar b/zxingorg/web/WEB-INF/lib/httpcore-nio-4.0-beta1.jar
deleted file mode 100644
index eca002d1b..000000000
Binary files a/zxingorg/web/WEB-INF/lib/httpcore-nio-4.0-beta1.jar and /dev/null differ
diff --git a/zxingorg/web/WEB-INF/lib/httpcore-nio-4.0-beta2.jar b/zxingorg/web/WEB-INF/lib/httpcore-nio-4.0-beta2.jar
new file mode 100644
index 000000000..057e2c5a5
Binary files /dev/null and b/zxingorg/web/WEB-INF/lib/httpcore-nio-4.0-beta2.jar differ
diff --git a/zxingorg/web/WEB-INF/lib/httpmime-4.0-alpha3.jar b/zxingorg/web/WEB-INF/lib/httpmime-4.0-alpha4.jar
similarity index 72%
rename from zxingorg/web/WEB-INF/lib/httpmime-4.0-alpha3.jar
rename to zxingorg/web/WEB-INF/lib/httpmime-4.0-alpha4.jar
index 093b3317f..ecc7f856f 100644
Binary files a/zxingorg/web/WEB-INF/lib/httpmime-4.0-alpha3.jar and b/zxingorg/web/WEB-INF/lib/httpmime-4.0-alpha4.jar differ