diff --git a/scripts/common_startup.sh b/scripts/common_startup.sh
index 84cc40a13ca..25a3d59fe98 100755
--- a/scripts/common_startup.sh
+++ b/scripts/common_startup.sh
@@ -82,7 +82,9 @@ if [ $SKIP_CLIENT_BUILD -eq 0 ]; then
         SKIP_CLIENT_BUILD=1
     fi
     if [ $SKIP_CLIENT_BUILD -eq 0 ]; then
-        echo "The Galaxy client build is out of date.  Please run 'make client-production' or your choice of build target.  Please see ./client/README.md for more information."
+        echo "The Galaxy client build is out of date.  Please run 'make client' or your choice of client build target (client-*)."
+        echo "If you're sure you'd like to skip this check, you can run galaxy with the --no-client-build flag, though this is not recommended as the client and server code will potentially be out of sync."
+        echo "See ./client/README.md in the Galaxy repository for more information, including how to get help if you're having trouble."
         exit 1
     fi
 fi