Adjust expected fatal error message
Now also includes "on [TYPE]" after merge from master