Further stack trace message tweaking
Restore accidentally removed strings