diff --git a/apps/desktopgui/bundle-messages.sh b/apps/desktopgui/bundle-messages.sh
index 984a94278..22b6038ce 100644
--- a/apps/desktopgui/bundle-messages.sh
+++ b/apps/desktopgui/bundle-messages.sh
@@ -16,7 +16,7 @@ TMPFILE=build/javafiles.txt
 export TZ=UTC
 RC=0
 
-if ! $(which javac); then
+if ! $(which javac > /dev/null 2>&1); then
     export JAVAC=${JAVA_HOME}/../bin/javac
 fi
 
diff --git a/apps/i2psnark/java/bundle-messages.sh b/apps/i2psnark/java/bundle-messages.sh
index bc4ad11cd..c301622ed 100755
--- a/apps/i2psnark/java/bundle-messages.sh
+++ b/apps/i2psnark/java/bundle-messages.sh
@@ -15,7 +15,7 @@ TMPFILE=build/javafiles.txt
 export TZ=UTC
 RC=0
 
-if ! $(which javac]; then
+if ! $(which javac > /dev/null 2>&1); then
     export JAVAC=${JAVA_HOME}/../bin/javac
 fi
 
diff --git a/apps/i2ptunnel/java/bundle-messages.sh b/apps/i2ptunnel/java/bundle-messages.sh
index 22646f9b4..9d38feebb 100755
--- a/apps/i2ptunnel/java/bundle-messages.sh
+++ b/apps/i2ptunnel/java/bundle-messages.sh
@@ -14,7 +14,7 @@ CLASS=net.i2p.i2ptunnel.web.messages
 TMPFILE=build/javafiles.txt
 export TZ=UTC
 RC=0
-if ! $(which javac); then
+if ! $(which javac > /dev/null 2>&1); then
     export JAVAC="${JAVA_HOME}/../bin/javac"
 fi
 
diff --git a/apps/routerconsole/java/bundle-messages.sh b/apps/routerconsole/java/bundle-messages.sh
index de89fa420..5ed74614a 100755
--- a/apps/routerconsole/java/bundle-messages.sh
+++ b/apps/routerconsole/java/bundle-messages.sh
@@ -15,7 +15,7 @@ TMPFILE=build/javafiles.txt
 export TZ=UTC
 RC=0
 
-if ! $(which javac); then
+if ! $(which javac > /dev/null 2>&1); then
     export JAVAC=${JAVA_HOME}/../bin/javac
 fi
 
diff --git a/apps/susidns/src/build.xml b/apps/susidns/src/build.xml
index ddf0bfec8..ed71e2638 100644
--- a/apps/susidns/src/build.xml
+++ b/apps/susidns/src/build.xml
@@ -126,7 +126,7 @@
         <!-- Update the messages_*.po files.
              We need to supply the bat file for windows, and then change the fail property to true -->
         <exec executable="sh" osfamily="unix" failifexecutionfails="true" failonerror="${require.gettext}" >
-            <env key="JAVA_HOME" value="${JAVA_HOME}" />
+            <env key="JAVA_HOME" value="${java.home}" />
             <arg value="./bundle-messages.sh" />
         </exec>
         <exec executable="sh" osfamily="mac" failifexecutionfails="true" failonerror="${require.gettext}" >
diff --git a/apps/susidns/src/bundle-messages.sh b/apps/susidns/src/bundle-messages.sh
index 226e03729..b16b59878 100755
--- a/apps/susidns/src/bundle-messages.sh
+++ b/apps/susidns/src/bundle-messages.sh
@@ -15,7 +15,7 @@ TMPFILE=tmp/javafiles.txt
 export TZ=UTC
 RC=0
 
-if ! $(which javac); then
+if ! $(which javac > /dev/null 2>&1); then
     export JAVAC=${JAVA_HOME}/../bin/javac
 fi
 
diff --git a/apps/susimail/bundle-messages.sh b/apps/susimail/bundle-messages.sh
index a5ae6b729..bb57c9bea 100644
--- a/apps/susimail/bundle-messages.sh
+++ b/apps/susimail/bundle-messages.sh
@@ -15,7 +15,7 @@ TMPFILE=javafiles.txt
 export TZ=UTC
 RC=0
 
-if ! $(which javac); then
+if ! $(which javac > /dev/null 2>&1); then
     export JAVAC=${JAVA_HOME}/../bin/javac
 fi