diff --git a/build/build.xml b/build/build.xml
index a27add870..1b47b45d0 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -835,11 +835,11 @@
     -->
 
     <!-- use the jre subfolder when having downloaded a JDK file -->
-    <condition property="jre.dir" value="jdk${jdk.esoteric}/jre/">
+    <condition property="jre.dir" value="jdk${jdk.esoteric}/jre">
       <!-- property might not be set, but it is for arm -->
       <equals arg1="${jre.download.jdk}" arg2="true" />
     </condition>
-    <condition property="jre.dir" value="jre${jdk.esoteric}/">
+    <condition property="jre.dir" value="jre${jdk.esoteric}">
       <not>
         <equals arg1="${jre.download.jdk}" arg2="true" />
       </not>
diff --git a/build/jre/src/Downloader.java b/build/jre/src/Downloader.java
index 5c989684e..faef58787 100644
--- a/build/jre/src/Downloader.java
+++ b/build/jre/src/Downloader.java
@@ -158,8 +158,10 @@ public class Downloader extends Task {
       }
       List<String> cookies = headers.get("Set-Cookie");
       conn = (HttpURLConnection) new URL(url).openConnection();
-      for (String cookie : cookies) {
-        conn.setRequestProperty("Cookie", cookie);
+      if (cookies != null) {
+        for (String cookie : cookies) {
+          conn.setRequestProperty("Cookie", cookie);
+        }
       }
       conn.setRequestProperty("Cookie", COOKIE);
       conn.connect();