#559486 follow-up by plach: Fixed fatal error in tests that for whatever reason testing bot is not catching. Grrr.