remove some die() calls
fix the previous changes eliminating $' for #61395