diff --git a/lib/prerequisites.sh b/lib/prerequisites.sh
index 9a1e39f..28958b3 100755
--- a/lib/prerequisites.sh
+++ b/lib/prerequisites.sh
@@ -71,16 +71,16 @@ source /etc/bridgehead/${PROJECT}.conf
 source ${PROJECT}/vars
 
 set +e
-SERVERTIME=$(https_proxy=$HTTPS_PROXY_URL curl -m 5 -I $BROKER_URL)
+SERVERTIME="$(https_proxy=$HTTPS_PROXY_URL curl -m 5 -s -v $BROKER_URL 2>&1)"
 if [ $? -ne 0 ]; then
-	log ERROR "Unable to connect to Samply.Beam broker at $BROKER_URL. Please check your proxy settings."
+	log ERROR "Unable to connect to Samply.Beam broker at $BROKER_URL. Please check your proxy settings.\nThe currently configured proxy was \"$HTTPS_PROXY_URL\"."
 	exit 1
 fi
 set -e
 
 log INFO "Checking clock skew ..."
 
-SERVERTIME=$(echo $SERVERTIME | grep -i ^Date: | cut -d: -f2- | sed 's/^ *\(.*\).*/\1/')
+SERVERTIME=$(echo -e "$SERVERTIME" | grep Date | sed -e 's/< Date: //')
 SERVERTIME_AS_TIMESTAMP=$(date --date="$SERVERTIME" +%s)
 MYTIME=$(date +%s)
 SKEW=$(($SERVERTIME_AS_TIMESTAMP - $MYTIME))
@@ -88,6 +88,8 @@ SKEW=$(echo $SKEW | awk -F- '{print $NF}')
 if [ $SKEW -ge 300 ]; then
 	log ERROR "Your clock is not synchronized (${SKEW}s off). This will cause Samply.Beam's certificate will fail. Please setup time synchronization. For example, consider entering a correct NTP server (e.g. your institution's Active Directory Domain Controller in /etc/systemd/timesyncd.conf (option NTP=) and restart systemd-timesyncd."
 	exit 1
+elif [ $SKEW -ge 60 ]; then
+	log WARN "Your clock is more than a minute off (${SKEW}s). Consider syncing to a time server."
 fi
 
 log INFO "Success - all prerequisites are met!"