diff --git a/metrics_gather.sh b/metrics_gather.sh
index 35bf397..70f2e5c 100755
--- a/metrics_gather.sh
+++ b/metrics_gather.sh
@@ -250,7 +250,7 @@ av2 | av2-ai | av2-ra | av2-ra-st | av2-ld | av2-as)
       echo "#!/bin/bash" > /tmp/enc$$.sh
       echo "TIMER='time -v --output='enctime$$-\$1.out" >> /tmp/enc$$.sh
       echo "RUN='$AOMENC --codec=av1 --cq-level=$x --test-decode=fatal $CTC_PROFILE_OPTS -o $BASENAME-'\$1'.obu $EXTRA_OPTIONS --limit=130 --'\$1'=65 $FILE'" >> /tmp/enc$$.sh
-      echo "\$(\$TIMER \$RUN > $BASENAME$$-stdout.txt)" >> /tmp/enc$$.sh
+      echo "\$(\$TIMER \$RUN > $BASENAME$$-stdout.txt 2> $BASENAME$$-stderr.txt)" >> /tmp/enc$$.sh
       chmod +x /tmp/enc$$.sh
       for s in {limit,skip}; do printf "$s\0"; done | xargs -0 -n1 -P2 /tmp/enc$$.sh
       $(cat $BASENAME-limit.obu $BASENAME-skip.obu > $BASENAME.obu)
@@ -260,7 +260,7 @@ av2 | av2-ai | av2-ra | av2-ra-st | av2-ld | av2-as)
       rm -f /tmp/enc$$.sh enctime$$-limit.out enctime$$-skip.out $BASENAME-limit.obu $BASENAME-skip.obu
       ;;
     *)
-      $($TIMER $AOMENC --codec=av1 --cq-level=$x --test-decode=fatal $CTC_PROFILE_OPTS -o $BASENAME.obu $EXTRA_OPTIONS $FILE  > "$BASENAME-stdout.txt")
+      $($TIMER $AOMENC --codec=av1 --cq-level=$x --test-decode=fatal $CTC_PROFILE_OPTS -o $BASENAME.obu $EXTRA_OPTIONS $FILE  > "$BASENAME-stdout.txt" 2> "$BASENAME-stderr.txt")
       ;;
   esac
   # decode the OBU to Y4M
@@ -299,7 +299,7 @@ thor-rt)
   SIZE=$(stat -c %s $BASENAME.thor)
   ;;
 rav1e)
-  $($TIMER $RAV1E $FILE --quantizer $x -o $BASENAME.ivf -r $BASENAME-rec.y4m --threads 1 $EXTRA_OPTIONS > $BASENAME-enc.out)
+  $($TIMER $RAV1E $FILE --quantizer $x -o $BASENAME.ivf -r $BASENAME-rec.y4m --threads 1 $EXTRA_OPTIONS > "$BASENAME-stdout.txt" 2> "$BASENAME-stderr.txt")
   if hash dav1d 2>/dev/null; then
     $($TIMERDEC dav1d -q -i $BASENAME.ivf -o $BASENAME.y4m) || (echo "Corrupt bitstream detected!"; exit 98)
   elif hash aomdec 2>/dev/null; then
diff --git a/work.py b/work.py
index 1fbb515..3b93827 100644
--- a/work.py
+++ b/work.py
@@ -107,7 +107,7 @@ class RDWork(Work):
     def __init__(self):
         super().__init__()
         self.no_delete = False
-        self.copy_back_files = ['-stdout.txt']
+        self.copy_back_files = ['-stdout.txt', '-stderr.txt']
     def parse(self, stdout, stderr):
         self.raw = stdout
         split = None