Doesn't really fix the crash I was seeing, but does hide it away :)
Anyway, its a real bug ...