diff --git a/docker/Dockerfile_sapsailing_on_sapmachine17 b/docker/Dockerfile_sapsailing_on_sapmachine17
index 221b8956cea..b61a9102a2b 100644
--- a/docker/Dockerfile_sapsailing_on_sapmachine17
+++ b/docker/Dockerfile_sapsailing_on_sapmachine17
@@ -1,4 +1,4 @@
-FROM sapmachine:17.0.11
+FROM sapmachine:17.0.13
 # This Dockerfile assumes that the release to use is provided as
 # ${RELEASE}.tar.gz in the current Docker workspace. Use, e.g.,
 # the configuration/github-download-release-assets.sh script to
diff --git a/docker/Dockerfile_windestimation-on-sapmachine17 b/docker/Dockerfile_windestimation-on-sapmachine17
index 87d3c72747e..8c180201848 100755
--- a/docker/Dockerfile_windestimation-on-sapmachine17
+++ b/docker/Dockerfile_windestimation-on-sapmachine17
@@ -1,4 +1,4 @@
-FROM sapmachine:17.0.11
+FROM sapmachine:17.0.13
 LABEL maintainer=axel.uhl@sap.com
 # Download and extract the release
 WORKDIR /home/sailing
diff --git a/java/target/env.sh b/java/target/env.sh
index 9cc02038640..12beacce127 100755
--- a/java/target/env.sh
+++ b/java/target/env.sh
@@ -72,7 +72,7 @@ CODE_DIRECTORY=code
 
 # Figuring out what the "mail" tool version is so we
 # can know whether it requires -a or -A to attach a file:
-if mail -V | grep -q "GNU Mailutils"; then
+if mail -V | grep -q "GNU Mailutils" 2>/dev/null; then
   MAIL_ATTACH_OPTION="-A"
 else
   MAIL_ATTACH_OPTION="-a"