Fix crash in bug 400104 again

And also make clazy happier so we don't need an exclude
2 jobs for master in 10 minutes and 57 seconds (queued for 66 minutes and 33 seconds)