Grrrr
Merge pull request #12115 from cachedout/test_fix

Fix stacktrace