diff --git a/tools/ps_validate.sh b/tools/ps_validate.sh
index 5bce3c29b7ad03e940ef27f5b30936c12e6d1031..fabd31a75c663c9399f6ef66c188169a7f8963d6 100755
--- a/tools/ps_validate.sh
+++ b/tools/ps_validate.sh
@@ -26,13 +26,28 @@ do
   if [ ! -z replay.baseline/stdout.$input ];
   then
     if [ ! $? -eq 0 ]; then
-      echo "ps_validate.sh: divergence detected for input $i"
+      echo "ps_validate.sh: divergence detected for input $i (stdout)"
 
-      echo "Baseline file:"
+      echo "Baseline file (stdout):"
       cat replay.baseline/stdout.$input
 
-      echo "Output stdout:$input.$fn:"
-      cat stdout.$input.$fn
+      echo "Output stdout (stdout):$input:"
+      cat stdout.$input
+
+      exit 1
+    fi
+  fi
+
+  if [ ! -z replay.baseline/stderr.$input ];
+  then
+    if [ ! $? -eq 0 ]; then
+      echo "ps_validate.sh: divergence detected for input $i (stderr)"
+
+      echo "Baseline file (stderr):"
+      cat replay.baseline/stderr.$input
+
+      echo "Output stderr (stderr):$input:"
+      cat stderr.$input
 
       exit 1
     fi